Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_...

zouyu

3 天以前 8f98ff2e202e5d7a39be484753db63d0165d70d7

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

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

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