Merge branch 'dev-lqc' into test

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

@@ -124,7 +124,7 @@ public class FosterwxCashWorkClientController {
                     fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
                 }
 
-            } else if (2 == fosterwxCashScheduleTaskList.getTaskType()) {
+            } else {
                 FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();
                 urlInfo.setTitle(fosterwxCashWorkwxTaskList.getUrlTitle());
                 urlInfo.setDesc(fosterwxCashWorkwxTaskList.getUrlDesc());
@@ -137,7 +137,7 @@ public class FosterwxCashWorkClientController {
             fosterwxCashBoxClientInfoList.add(fosterwxCashBoxClientInfo);
         });
 
-        return AjaxResult.success(fosterwxCashScheduleTaskListList);
+        return AjaxResult.success(fosterwxCashBoxClientInfoList);
     }
 
     /**