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

buhuazhen

4 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

 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;