Merge branch 'dev_New_pro' into dev_pro_山西长治

gongchunyi

2026-07-05 6f266c7dbc1f843e00d4f48dfd3a61671f70e124

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

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

    private Long templateId;
}