Merge branch 'dev_New_pro' into dev_山西_黎城县胜德建材

云

2026-05-07 031399b2893306a010cb4a6b0261441deb0d6625

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

@@ -37,7 +37,7 @@
    /**
     * 关联的私海id
     */
    private Long customerPrivatePoolId;
    private Long customerId;

    /**
     * 跟进方式