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

maven

7 天以前 259e978c64b36f57aa1959c6d760416b86b26c34

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

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

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