Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -1503,11 +1503,11 @@ public class WeiXinCorpController {
 
     private List<Stage> getStageBaseList(Company company) {
         ArrayList<Stage> stages = new ArrayList<>();
-        Stage stage1 = new Stage().setName("赢单").setPlan("100%").setSeq(4).setIsFinish(1).setCompanyId(company.getId());
+        Stage stage1 = new Stage().setName("赢单").setPlan("100%").setSeq(4).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
         stages.add(stage1);
-        Stage stage2 = new Stage().setName("输单").setPlan("0%").setSeq(5).setIsFinish(1).setCompanyId(company.getId());
+        Stage stage2 = new Stage().setName("输单").setPlan("0%").setSeq(5).setIsFinish(1).setCompanyId(company.getId()).setColor("#FF5531");
         stages.add(stage2);
-        Stage stage3 = new Stage().setName("无效").setPlan("0%").setSeq(6).setIsFinish(1).setCompanyId(company.getId());
+        Stage stage3 = new Stage().setName("无效").setPlan("0%").setSeq(6).setIsFinish(1).setCompanyId(company.getId()).setColor("#F4F5F7");
         stages.add(stage3);
         return stages;
     }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -1342,11 +1342,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     private List<Stage> getStageBaseList(Company company) {
         ArrayList<Stage> stages = new ArrayList<>();
-        Stage stage1 = new Stage().setName("赢单").setPlan("100%").setSeq(4).setIsFinish(1).setCompanyId(company.getId());
+        Stage stage1 = new Stage().setName("赢单").setPlan("100%").setSeq(4).setIsFinish(1).setCompanyId(company.getId()).setColor("#075985");
         stages.add(stage1);
-        Stage stage2 = new Stage().setName("输单").setPlan("0%").setSeq(5).setIsFinish(1).setCompanyId(company.getId());
+        Stage stage2 = new Stage().setName("输单").setPlan("0%").setSeq(5).setIsFinish(1).setCompanyId(company.getId()).setColor("#FF5531");
         stages.add(stage2);
-        Stage stage3 = new Stage().setName("无效").setPlan("0%").setSeq(6).setIsFinish(1).setCompanyId(company.getId());
+        Stage stage3 = new Stage().setName("无效").setPlan("0%").setSeq(6).setIsFinish(1).setCompanyId(company.getId()).setColor("#F4F5F7");
         stages.add(stage3);
         return stages;
     }