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

zss

6 天以前 14de446d42a23f8823f56ef79214e0d0d634adaa

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

@@ -25,6 +25,8 @@

    private String approveUserIds;

    private String approveDeptName;

    private Long approveUser;

    private String approveTime;