diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java index 4a6907f08..644a03407 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java @@ -64,7 +64,7 @@ public class FreeDineConfig implements Serializable { // /** // * 使用类型 dine-in店内 takeout 自取 post快递,takeaway外卖 // */ -// private String useType; + private String useType; /** * 门店id diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/FreeDineConfigVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/FreeDineConfigVO.java index 93921c6a0..f88fbf4a0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/FreeDineConfigVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/FreeDineConfigVO.java @@ -48,7 +48,7 @@ public class FreeDineConfigVO implements Serializable { // /** // * 使用类型 dine-in店内 takeout 自取 post快递,takeaway外卖 // */ -// private String useType; + private List useType; /** * 门店id diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java index 760bb0f7e..24f1a1d21 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java @@ -34,6 +34,10 @@ public class FreeDineConfigServiceImpl extends ServiceImpl