Merge branch 'jtwy' into dev_New

zss

2 天以前 e435c834aac75f49cf2d1945bd4f849524e8b59c

 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;