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

gongchunyi

2 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 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;
}