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

maven

4 天以前 a20dad0f0702e192bee8b80c6237a0e9bb7d8b66

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

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

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