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

gongchunyi

3 天以前 cca82e1212056b0ec17e038912f3b0c2ba1e9c61

 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;