Kaynağa Gözat

Merge branch 'V2.0.1' into test

zhaoxian 3 yıl önce
ebeveyn
işleme
02e73985a0

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/controller/RuleTemplateController.java

@@ -166,7 +166,7 @@ public class RuleTemplateController {
         if (!Check.isNull(templateName)) {
             queryWrapper.like("template_name", templateName);
         }
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         Page<RuleTemplate> page = new Page<RuleTemplate>(pageNo, pageSize);
         IPage<RuleTemplate> pageList = ruleTemplateService.page(page, queryWrapper);
         result.setSuccess(true);

+ 1 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/RuleAccountTemplateMapper.xml

@@ -46,6 +46,7 @@
         <if test="params.userName !=null and params.userName !='' ">
             and t4.realname like concat(concat('%',#{params.userName}),'%')
         </if>
+        order by t1.update_time desc
     </select>
 
 </mapper>

+ 0 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -1631,8 +1631,6 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
      * @param requestJson
      * @return
      */
-
-
     @Override
     public JSONObject createRuleGroup(com.alibaba.fastjson.JSONObject requestJson) {
         JSONObject returnJson = new JSONObject();

+ 2 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/entity/AiKuaishouUnitLevelOperationRecord.java

@@ -316,4 +316,6 @@ public class AiKuaishouUnitLevelOperationRecord {
      * 深度转化目标出价
      */
     private Integer deepConversionBid;
+    private Long targetCombineId;
+
 }

+ 2 - 2
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-prod.yml

@@ -261,7 +261,7 @@ bytedance:
     advertiser-fund-daily-stat: /2/advertiser/fund/daily_stat/
 ai:
   callback:
-    callback-unit-url: http://192.168.1.193:31012/ai_callback_add_group
-    callback-creative-url: http://192.168.1.193:31012/ai_callback_add_creative
+    callback-unit-url: http://139.186.27.96::31012/ai_callback_add_group
+    callback-creative-url: http://139.186.27.96::31012/ai_callback_add_creative
 xxl-job:
   requestUrl: http://jiaoyangapi.shyouteng.com.cn