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

zss

8 天以前 8a5ac1e030826485463c078cdde03a065b45a960

 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;