Merge branch 'dev-lqc' into test

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

@@ -105,6 +105,7 @@ public class FosterwxCashWorkClientController {
                     eq(FosterwxCashWorkwxTaskList::getId, fosterwxCashScheduleTaskList.getChildTaskId()).
                     last("LIMIT 1"));
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
+            fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
             if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
                 FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
                 if (null != fosterwxCashWorkBoxClientInfo) {

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

@@ -10,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class FosterwxCashBoxClientInfo {
+    private Integer taskType;
+
     private UrlInfo urlInfo;
 
     private BoxInfo boxInfo;