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

gongchunyi

2026-04-03 75ab3e422024b04730c2ce3b5014890d3e731fa8

 src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java

@@ -24,4 +24,8 @@
    private String approveTime;

    private Integer approveStatus;
    /**
     * 审批类型
     */
    private Integer approveType;
}