diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java index 9ebdc8120..0ce2a8f3e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java @@ -104,6 +104,8 @@ public class BasicdataPriceTemplateEntity extends TenantEntity { private String warehousePieceCategory; @ApiModelProperty(value = "仓储-附加费计价单位") private Integer warehouseSubjoinFeeUnit; + @ApiModelProperty(value = "仓储-是否附加费") + private Integer warehouseIsAddFee; @ApiModelProperty(value = "仓储-是否有管理费") private Integer warehouseIsManageFee; @ApiModelProperty(value = "仓储-是否有操作/装卸费") @@ -130,6 +132,8 @@ public class BasicdataPriceTemplateEntity extends TenantEntity { private String dispatchWeightCategory; @ApiModelProperty(value = "配送-是否按品类附加费计费") private Integer dispatchIsCategorySubjoin; + @ApiModelProperty(value = "配送-是否附加费") + private Integer dispatchIsAddFee; @ApiModelProperty(value = "配送-是否有分货费") private Integer dispatchIsSortFee; @ApiModelProperty(value = "配送-是否有操作/装卸费") diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java index f4312e4d2..04c83fe80 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java @@ -160,6 +160,7 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl