Merge remote-tracking branch 'origin/master'

yaowanxin

2025-10-21 b5f919e8cc4301b71ff6b12de93f7aefc823ca6d

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

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

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