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

gongchunyi

17 小时以前 0adbf58fd15052d8a044cf66eaa8afaa8591ba74

 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;