Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-09 c61d6d591652772ca92615f8cd5ac8c30322d33b

 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;