Merge branch 'jtwy' into dev_New

zss

10 天以前 e02d6b65fae6f05e37f42c66242f05391c4a6d1a

 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;