'提交代码'

hai-service/src/main/java/com/hai/service/HighMerchantService.java

@@ -1,6 +1,7 @@
 package com.hai.service;
 
 import com.hai.entity.HighMerchant;
+import com.hai.model.HighMerchantModel;
 
 import java.util.List;
 import java.util.Map;
@@ -13,7 +14,7 @@ public interface HighMerchantService {
     /**
      * 编辑
      */
-    void editMerchant(HighMerchant highMerchant) throws Exception;
+    void editMerchant(HighMerchantModel highMerchant) throws Exception;
 
     /**
      * 根据id查询

hai-service/src/main/java/com/hai/service/HighMerchantStoreService.java

@@ -1,6 +1,7 @@
 package com.hai.service;
 
 import com.hai.entity.HighMerchantStore;
+import com.hai.model.HighMerchantStoreModel;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +18,7 @@ public interface HighMerchantStoreService {
      * @Description 编辑门店
      * @Date 2021/3/9 20:26
      **/
-    void editMerchantStore(HighMerchantStore highMerchantStore) throws Exception;
+    void editMerchantStore(HighMerchantStoreModel highMerchantStore) throws Exception;
 
     /**
      * @Author 胡锐

hai-service/src/main/java/com/hai/service/impl/HighMerchantServiceImpl.java

@@ -5,6 +5,7 @@ import com.hai.dao.HighMerchantMapper;
 import com.hai.entity.HighMerchant;
 import com.hai.entity.HighMerchantExample;
 import com.hai.entity.SecUser;
+import com.hai.model.HighMerchantModel;
 import com.hai.service.HighMerchantService;
 import com.hai.service.SecUserService;
 import org.apache.commons.collections4.MapUtils;
@@ -28,7 +29,7 @@ public class HighMerchantServiceImpl implements HighMerchantService {
 
     @Override
     @Transactional
-    public void editMerchant(HighMerchant highMerchant) throws Exception {
+    public void editMerchant(HighMerchantModel highMerchant) throws Exception {
         if (highMerchant.getId() == null) {
             highMerchantMapper.insert(highMerchant);
 

hai-service/src/main/java/com/hai/service/impl/HighMerchantStoreServiceImpl.java

@@ -9,6 +9,7 @@ import com.hai.dao.HighMerchantStoreMapper;
 import com.hai.entity.HighMerchantStore;
 import com.hai.entity.HighMerchantStoreExample;
 import com.hai.entity.SecUser;
+import com.hai.model.HighMerchantStoreModel;
 import com.hai.service.HighMerchantStoreService;
 import com.hai.service.SecUserService;
 import org.apache.commons.collections4.MapUtils;
@@ -32,7 +33,7 @@ public class HighMerchantStoreServiceImpl implements HighMerchantStoreService {
 
     @Override
     @Transactional
-    public void editMerchantStore(HighMerchantStore highMerchantStore) throws Exception {
+    public void editMerchantStore(HighMerchantStoreModel highMerchantStore) throws Exception {
         if (highMerchantStore.getId() != null) {
             highMerchantStoreMapper.updateByPrimaryKey(highMerchantStore);
         } else {