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

zss

5 天以前 5a6ac2ffb3815f1ef510144dd6e88c64ee96f973

 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;