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

gongchunyi

5 天以前 70538f5464af062cd52628d468a17a8bb885e88f

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

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

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