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/controller/pangu/FosterwxMobileController.java

@@ -421,6 +421,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                 FosterwxTaskList fosterwxTaskList = fosterwxTaskListService.getById(fosterwxTaskSchedule.getTaskId());
                 if (null != fosterwxTaskList) {
                     fosterwxTaskSchedule.setVideoUrl(fosterwxTaskList.getVideoUrl());
+                    fosterwxTaskSchedule.setTaskContent(fosterwxTaskList.getTaskContent());
                 }
             });
 

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/task/pangu/SyncNewFosterwxTask.java

@@ -69,6 +69,7 @@ public class SyncNewFosterwxTask {
                     handle.setTaskId(fosterwxTaskSchedule.getTaskId());
                     handle.setStationId(fosterwxTaskSchedule.getStationId());
                     handle.setSendDate(fosterwxTaskSchedule.getSendDate());
+                    fosterwxTaskSchedule.setTaskContent(fosterwxTaskListService.getById(fosterwxTaskSchedule.getTaskId()).getTaskContent());
                     FosterwxTaskSchedule taskInfo = fosterwxTaskScheduleService.getInfo(handle);
                     if (taskInfo == null) {
                         continue;