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

yaowanxin

昨天 17a7110753d9efeeaca28d7869fec4d084fc2d46

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

@@ -11,4 +11,10 @@
public class SalesQuotationDto extends SalesQuotation {
    @ApiModelProperty(value = "报价商品")
    private List<SalesQuotationProduct> products;

    /**
     * 审批人id列表
     */
    // 审批人
    private String approveUserIds;
}