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

liyong

16 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

 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;