diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSettingController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSettingController.java index 3db190b..40d6d44 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSettingController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSettingController.java @@ -35,7 +35,7 @@ public class KitchenSettingController extends BaseController { @ApiOperation(value = "查询功能参数配置列表") //@RequiresPermissions("kitchen:setting:list") @GetMapping("/list") - public TableDataInfo list(@Valid KitchenSetting kitchenSetting) { + public TableDataInfo list(KitchenSetting kitchenSetting) { startPage(); List list = kitchenSettingService.selectKitchenSettingList(kitchenSetting); return getDataTable(list); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java index e33fe48..52e4bac 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSetting.java @@ -26,7 +26,6 @@ public class KitchenSetting extends BaseEntity { /** 参数键名 */ @Excel(name = "参数键名") @ApiModelProperty(value = "参数键名") - @NoPercent private String itemName; /** 参数主键 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSettingMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSettingMapper.xml index c300308..7e8e3a0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSettingMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSettingMapper.xml @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"