Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppBusSalesOrderModelDto.java

@@ -36,6 +36,7 @@ public class AppBusSalesOrderModelDto implements Dto {
     private String arrangeNumber;
 
     @ApiModelProperty(value = "销售指导价")
+    @NotBlank(message = "销售指导价不能为空")
     private String guildPrice;
 
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -22,7 +22,7 @@ public enum ProcDefEnum {
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),//ToDo:正式新2022-11-25
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:6:820004"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:7:827504"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),//ToDo:正式新2022-11-25
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),//ToDo:正式新2022-11-25
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),//ToDo:正式新2022-11-25