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

maven

10 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025

 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;