Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java

@@ -50,7 +50,9 @@ import lombok.Data;
 public class BaseOutsourcingApplicationVo implements Vo {
 
 	@ApiModelProperty("外采申请单sid")
-	private String sid; // 申请编号s
+	private String sid; // 外采申请单sid
+	@ApiModelProperty("分公司名称")
+	private String useOrgName; // 分公司名称
 	@ApiModelProperty("申请编号")
     private String applicationCode; // 申请编号
 	@ApiModelProperty("申请日期")

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

@@ -9,7 +9,8 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
 //    CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
-    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//测试销售政策流程定义id
+    //SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:822504"),//测试销售政策流程定义id
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
 //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventoryreportDto.java

@@ -18,4 +18,7 @@ public class VehInventoryreportDto implements Dto {
     private List<ReportListDto> recipientList;
 
     private String userSid;
+
+    @ApiModelProperty("未盘原因")
+    private String reason;
 }