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

yaowanxin

18 小时以前 2be90eb75452c8f0820d89cb1cd018dd86a351e0

 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;