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

yaowanxin

6 天以前 a0914318549b357ef3c438d0c2a3714f58ea3487

 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;