Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

3 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2

 src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml

@@ -41,7 +41,7 @@
            <if test="c.customerType != null">
                and c.customer_type = #{c.customerType}
            </if>
            <if test="c.bound_id != null">
            <if test="c.boundId != null">
                and cpp.bound_id = #{c.boundId}
            </if>