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

liyong

4 天以前 f5624a59380db70633eebe3612e2d3c703012b41

 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;