Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

10 天以前 09394848ce262aff81897503d32ec334fd3f2b6f

 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;