Merge branch 'dev_tide' into dev_tide_sbjkxt

zouyu

3 天以前 633ec5aed640938430dba08b14b70b5fc3170dad

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

@@ -24,4 +24,8 @@
    private String approveTime;

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