Merge branch 'jd_dev' into 'release'

# Conflicts:
#   yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customer/CustomerComplaintMapper.java

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/customer/CustomerComplaintMapper.java

@@ -53,8 +53,8 @@ public interface CustomerComplaintMapper extends BaseMapperX<CustomerComplaintDO
             "AND plaint.`status` = #{query.status}",
             "</when>",
 
-            "<when test = 'query.customerNumber != null and query.code != \"\" '>",
-            "AND customer.number like concat('%',concat(#{query.customerNumber},'%'))",
+            "<when test = 'query.customerNumber != null and query.customerNumber != \"\" '>",
+            "AND customer.`number` like concat('%',concat(#{query.customerNumber},'%'))",
             "</when>",
 
             "<when test = 'query.code != null and query.code != \"\" '>",

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customer/complaint/CustomerComplaintPageReqVO.java

@@ -41,6 +41,9 @@ public class CustomerComplaintPageReqVO extends PageParam {
     @ApiModelProperty(value = "创建人")
     private Long creator;
 
+    @ApiModelProperty("客户编号")
+    private String customerNumber;
+
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始创建时间")
     private Date beginCreateTime;