Merge branch 'jtwy' into dev_New

zss

9 天以前 d972907df11fa76d5766e9aed7f0d36488310d99

 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;