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

buhuazhen

9 天以前 2df3f64bbacbf960e1d6b9b73893aeb0c01b7d1d

 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;