Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

yyb

4 天以前 793f77aaecdb801b68bf84da4ea8dcac7a3157d4

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

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

    private Long templateId;
}