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

maven

2 天以前 f6e755678fab0ccd8001523d29dc2efaa8d5810c

 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;