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

yaowanxin

3 天以前 005e11377f508e3a79b528572a386a2af43697ca

 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;