Merge branch 'dev_New_pro' into dev_宁夏_万通新型建材

zss

2026-05-11 0f47a819c93585eff9453b2af8615f8e62d54635

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

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

    private Long customerId;

    /**