Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2026-06-02 bd74f59a411383e32eb17a69cc5a7ada1571023e

 src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java

@@ -17,4 +17,6 @@
     */
    // 审批人
    private String approveUserIds;

    private Long templateId;
}