Merge branch 'dev' into pre-production

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -264,6 +265,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 * 客户名称
 	 */
 	@ApiModelProperty(value = "客户名称")
+	@TableField(exist = false)
 	private String clineName;