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

liyong

3 天以前 2cc19f8033348f34df382d27f63810b2d6f56a05

 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;