Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

13 小时以前 80c45ea7934443bea5355bc6bace96ec23a58600

 src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java

@@ -127,7 +127,7 @@
    private Long tenantId;

    /**
     * 审批类型
     * 审批类型 1-公出管理 2-请假管理 3-出差管理 4-报销管理 5-采购审批 6-报价审批 7-发货审批
     */
    private Integer approveType;