diff --git a/src/main/java/com/cultural/heritage/controller/good/GoodController.java b/src/main/java/com/cultural/heritage/controller/good/GoodController.java index dab5147..0015448 100644 --- a/src/main/java/com/cultural/heritage/controller/good/GoodController.java +++ b/src/main/java/com/cultural/heritage/controller/good/GoodController.java @@ -201,6 +201,7 @@ public class GoodController { good.setType("服务类"); good.setIsGoodType(0); good.setInventory(1); + good.setLabel("无"); good.setFestivalName("无"); // 校验 goodService.validGood(good, false); @@ -791,6 +792,7 @@ public class GoodController { good.setType("服务类"); good.setIsGoodType(0); good.setInventory(1); + good.setLabel("无"); good.setFestivalName("无"); // 校验 goodService.validGood(good, true); diff --git a/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodAddRequest.java b/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodAddRequest.java index 5a9c985..5dcf732 100644 --- a/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodAddRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodAddRequest.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; import java.util.List; @Data -@Schema(description = "服务类商品添加请求体", requiredProperties = {"name", "price", "goodImg", "intro", "richText", "label", "appointmentDateAddRequestList"}) +@Schema(description = "服务类商品添加请求体", requiredProperties = {"name", "price", "goodImg", "intro", "richText", "appointmentDateAddRequestList"}) public class ServiceGoodAddRequest implements Serializable { /** @@ -45,13 +45,6 @@ public class ServiceGoodAddRequest implements Serializable { private String richText; - /** - * 商品标签 - */ - @Schema(description = "商品标签", example = "亲情;送礼;材料包") - private String label; - - /** * 未来的预约详情 */ diff --git a/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodUpdateRequest.java b/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodUpdateRequest.java index d3e8bb4..053104d 100644 --- a/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodUpdateRequest.java +++ b/src/main/java/com/cultural/heritage/model/dto/good/service/ServiceGoodUpdateRequest.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; import java.util.List; @Data -@Schema(description = "服务类商品更新请求体", requiredProperties = {"id", "name", "price", "goodImg", "intro", "label", "richText", "appointmentDateUpdateRequestList"}) +@Schema(description = "服务类商品更新请求体", requiredProperties = {"id", "name", "price", "goodImg", "intro", "richText", "appointmentDateUpdateRequestList"}) public class ServiceGoodUpdateRequest implements Serializable { /** @@ -49,12 +49,6 @@ public class ServiceGoodUpdateRequest implements Serializable { @Schema(description = "商品详情(富文本)", example = "

") private String richText; - /** - * 商品标签 - */ - @Schema(description = "商品标签", example = "亲情;送礼;材料包") - private String label; - /** * 未来几天的预约时间表 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 42d4c0f..481ade6 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -102,4 +102,5 @@ wx: knife4j: - enable: false \ No newline at end of file + enable: true + production: true \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1ab53e5..18684a4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: prod