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

liyong

7 天以前 fe82da7485601580104c058f382405cc0cc9e043

 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;