Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯

云

8 天以前 e4c10a806ff29d18cdbdd182a5930316eae3fd83

 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;