diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java
index 23c4d6c..169cf98 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicCarouselImage.java
@@ -42,9 +42,9 @@ public class BasicCarouselImage extends BaseEntity {
@ApiModelProperty(value = "是否启用(1是;2否)")
private String ifEnabled;
- /** 用途类型(1-后台;2-APP) */
+ /** 用途类型(1-后台;2-APP;3-双屏消费机) */
@Excel(name = "用途类型(1-后台;2-APP)")
- @ApiModelProperty(value = "用途类型(1-后台;2-APP)")
+ @ApiModelProperty(value = "用途类型(1-后台;2-APP;3-双屏消费机)")
private String usageType;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java
index 442092a..2fe6023 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/domain/BasicSetting.java
@@ -32,5 +32,8 @@ public class BasicSetting extends BaseEntity {
@ApiModelProperty(value = "参数主键")
private String itemValue;
-
+ /** 用途类型(1-后台;2-APP;3-双屏消费机) */
+ @Excel(name = "用途类型(1-后台;2-APP)")
+ @ApiModelProperty(value = "用途类型(1-后台;2-APP;3-双屏消费机)")
+ private String usageType;
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java
index c67b3e7..6b81e96 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicSettingServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.canteen.core.basic.service.impl;
import java.util.List;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
+import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.canteen.core.basic.mapper.BasicSettingMapper;
@@ -51,6 +52,7 @@ public class BasicSettingServiceImpl implements IBasicSettingService {
@Override
public int insertBasicSetting(BasicSetting basicSetting) {
basicSetting.setCreateTime(DateUtils.getNowDate());
+ basicSetting.setCreateBy(SecurityUtils.getUsername());
try {
return basicSettingMapper.insertBasicSetting(basicSetting);
} catch (Exception e) {
@@ -67,6 +69,7 @@ public class BasicSettingServiceImpl implements IBasicSettingService {
@Override
public int updateBasicSetting(BasicSetting basicSetting) {
basicSetting.setUpdateTime(DateUtils.getNowDate());
+ basicSetting.setUpdateBy(SecurityUtils.getUsername());
try {
return basicSettingMapper.updateBasicSetting(basicSetting);
} catch (Exception e) {
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml
index de2330a..bf5bd0d 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/basic/BasicSettingMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -14,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, item_name, item_value, create_by, create_time, update_by, update_time from basic_setting
+ select id, item_name, item_value, usage_type, create_by, create_time, update_by, update_time from basic_setting