Merge branch 'dev' into dist.1.2.0

# Conflicts:
#	blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

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

@@ -279,7 +279,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	/**
 	 * 签收件数
 	 */
-	@ApiModelProperty(value = "客户名称")
+	@ApiModelProperty(value = "签收数量")
 	@TableField(exist = false)
 	private Integer signingNumber;
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientLogServiceImpl.java

@@ -37,10 +37,6 @@ import java.util.List;
 public class BasicdataClientLogServiceImpl extends BaseServiceImpl<BasicdataClientLogMapper, BasicdataClientLogEntity> implements IBasicdataClientLogService {
 
 
-	@PostConstruct
-	public void intt(){
-		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>11111111");
-	}
 
 
 	@Override

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -171,6 +171,15 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			if (!flag){
 				log.info(">>>>>>>>>>>>>>>>>>>>>>>记录客户修改日志操作失败");
 			}
+			if (Objects.isNull(basicdataClient.getBladeRegionProvinceId())){
+				basicdataClient.setBladeRegionProvinceId("");
+			}
+			if (Objects.isNull(basicdataClient.getBladeRegionAreaId())){
+				basicdataClient.setBladeRegionAreaId("");
+			}
+			if (Objects.isNull(basicdataClient.getBladeRegionCityId())){
+				basicdataClient.setBladeRegionCityId("");
+			}
 			//修改
 			this.updateById(basicdataClient);
 			List<BasicdataStoreBusinessEntity> list = basicdataStoreBusinessService.list(Wrappers.<BasicdataStoreBusinessEntity>query().lambda()

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -71,7 +71,7 @@ import java.util.Objects;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/deliveryList")
+@RequestMapping(value = "/deliveryList",produces = "application/json; charset=UTF-8")
 @Api(value = "配送管理", tags = "配送管理接口")
 @Slf4j
 public class DistributionDeliveryListController extends BladeController {
@@ -252,7 +252,7 @@ public class DistributionDeliveryListController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
-	public R<IPage<DistributionDeliveryListVO>> page(DistributionDeliveryListDTO distributionDeliveryList, Query query) {
+	public R<IPage<DistributionDeliveryListVO>> page( DistributionDeliveryListDTO distributionDeliveryList, Query query) {
 		IPage<DistributionDeliveryListEntity> pages = distributionDeliveryListService.selectDistributionDeliveryListPage(Condition.getPage(query), distributionDeliveryList);
 		return R.data(DistributionDeliveryListWrapper.build().pageVO(pages));
 	}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java

@@ -99,4 +99,11 @@ public class DistributionDeliveryAllocationDTO {
 	private Integer isAll;
 
 
+	/**
+	 * 是否整车
+	 */
+	@ApiModelProperty(value = "是否整车")
+	private Integer isAll;
+
+
 }