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

buhuazhen

3 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

 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;