Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-23 893fda1fa8bc17002a866381e8940e1c31d11d93

 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;