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

zss

20 小时以前 599b5ff692722226d1e30fbdffc594b826bfa815

 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;