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

maven

3 天以前 03386a78c3a1f92efa21a6748e38c2c5d1c996d9

 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;