Merge branch 'dev_tide' into dev_tide_cbsglxt

zouyu

3 天以前 4809db01709fd66fe3a25452ef41a6378b6ac6c8

 src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java

@@ -25,4 +25,9 @@
    private String approveUserIds;

    private String approveReason;

    /**
     * 审批类型
     */
    private Integer approveType;
}