Merge branch 'dev_New' into dev_New_kthg

zss

10 天以前 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

 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;