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

liyong

3 天以前 4635770544e2d57416ad88a8983ee293919f5fec

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

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

    private Long templateId;
}