Merge remote-tracking branch 'origin/master' into pim_zss

zss

2025-08-14 03df670a1dfbcae8031e84e15dff0b77365f0af6

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

@@ -1,11 +1,15 @@
package com.ruoyi.approve.vo;

import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.util.List;

@Data
public class ApproveProcessVO {

    private List<String> tempFileIds;

    private Long id;

@@ -21,4 +25,9 @@
    private String approveUserIds;

    private String approveReason;

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