Merge branch 'early_warning2422' into uat

# Conflicts:
#	suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -171,7 +171,7 @@ public class RyTask
   /*  public void  salesOrderBaseByCreditStatus(){
         HanaSalesOrderService.updateSalesOrderBaseNoCrditStatus();
     }*/
-    }
+
 
     /**
      * @description: 业绩进度指标预警邮件/企微消息通知