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

maven

9 天以前 b00f8a0bdccf0b0eed36f550e2c00176bfafe23f

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

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

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