Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_山西长治

yuan

2026-07-13 bb078cde6d9641ec84ee3c52b544153845795c0e

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

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

    private Long templateId;
}