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

云

2026-04-20 2cf0b0d03d285fb86c232703510cd80cceb6e186

 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;