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

云

8 天以前 0cb3eeb5b498f063f890b164d26ab9a0d0d79a1c

 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;