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

liyong

4 天以前 877504ede165b8c965b6cf6599708e7e48778034

 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;