Merge remote-tracking branch 'origin/dev_山西_华亿众成' into dev_山西_华亿众成

liyong

3 天以前 ea53c7b693d9ef991e36fde84b38b2f75e201ce2

 src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java

@@ -23,6 +23,9 @@
    @Excel(name = "客户名称")
    private String customer;

    @ApiModelProperty(value = "客户id")
    private Long customerId;

    @ApiModelProperty(value = "业务员")
    @Excel(name = "业务员")
    private String salesperson;