Merge branch 'dev-lqc'

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -119,8 +119,8 @@ public class FosterwxCashWorkClientController {
                     boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
                     boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
                     boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
-                    boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
-                    boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
+                    boxInfo.setImage_size(fosterwxCashWorkBoxClientInfo.getImageSize());
+                    boxInfo.setApp_type(fosterwxCashWorkBoxClientInfo.getAppType());
                     boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
                     fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
                 }

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxCashBoxClientInfo.java

@@ -84,12 +84,12 @@ public class FosterwxCashBoxClientInfo {
         /**
          * 缩略图大小
          */
-        private Integer imageSize;
+        private Integer image_size;
 
         /**
          * 小程序类型，默认2（0：小图样式 2：大图样式）
          */
-        private Integer appType;
+        private Integer app_type;
 
         /**
          * 小程序分享的标题

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashScheduleTaskListServiceImpl.java

@@ -110,7 +110,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
     /**
      * 生成任务 正常生成 | 生成失败|检测到公众号封禁重新生成链接
-     * @param editList
+     * @param newsList
      */
     @Override
     public void create(List<FosterwxCashScheduleTaskList> newsList) {
@@ -273,9 +273,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         }
 
         fosterwxCashScheduleTaskList.setSendUrl(sendUrl);
-        if (1 == fosterwxCashWorkwxTaskList.getTaskType()) {
-            fosterwxCashScheduleTaskList.setBoxUrl(sendUrl);
-        }
+        fosterwxCashScheduleTaskList.setBoxUrl(sendUrl);
 
         fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
     }