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

liyong

2026-05-12 a122cfc45d18b6e679029a88eb342e9081df6595

 src/main/java/com/ruoyi/basic/pojo/CustomerContact.java

@@ -42,13 +42,13 @@
     * 联系人名称
     */
    @ApiModelProperty("联系人名称")
    private String contactName;
    private String contactPerson;

    /**
     * 电话
     */
    @ApiModelProperty("电话")
    private String phone;
    private String contactPhone;

    /**
     * 关联客户信息表ID