diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
index ad6f31db..954685c6 100644
--- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
@@ -89,14 +89,14 @@
is_sure = #{isSure},
is_cert = #{isCert},
dept_rate = #{deptRate},
- dept_money = #{deptMoney},
+ dept_money = #{deptMoney},
retain_rate = #{retainRate},
- retain_money = #{retainMoney},
+ retain_money = #{retainMoney},
pc_dept_rate = #{pcDeptRate},
- pc_dept_money = #{pcDeptMoney},
+ pc_dept_money = #{pcDeptMoney},
pc_retain_rate = #{pcRetainRate},
- pc_retain_money = #{pcRetainMoney},
+ pc_retain_money = #{pcRetainMoney},
category_sort = #{categorySort},
one_rate = #{oneRate},
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
index 39d59395..77164e53 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
@@ -78,8 +78,12 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
*/
@Override
public List selectAfterServiceRecordList(AfterServiceRecord afterServiceRecord) {
+ if(afterServiceRecord == null){
+ afterServiceRecord = new AfterServiceRecord();
+ afterServiceRecord.setNeedImgs(false);
+ }
List list = afterServiceRecordMapper.selectAfterServiceRecordList(afterServiceRecord);
- if(!afterServiceRecord.getNeedImgs()){
+ if(afterServiceRecord.getNeedImgs() != null && !afterServiceRecord.getNeedImgs()){
return list;
}
list.forEach(record -> {
diff --git a/ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java b/ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java
new file mode 100644
index 00000000..07b3f74f
--- /dev/null
+++ b/ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java
@@ -0,0 +1,21 @@
+package com.ghy.system.domain;
+
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 轮播图管理
+ * @author clunt
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysBanner extends BaseEntity {
+
+ private Long id;
+
+ private String bannerUrl;
+
+ private String bannerTitle;
+
+}