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

liyong

6 天以前 cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218

 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;