222

fs-common/src/main/java/com/fs/common/core/domain/BaseEntity.java

@@ -59,7 +59,6 @@ public class BaseEntity implements Serializable
     @TableField(exist = false)
     private Map<String, Object> params;
 
-    private  Long merConfigId;
 
     public String getSearchValue()
     {
@@ -150,11 +149,4 @@ public class BaseEntity implements Serializable
         this.params = params;
     }
 
-    public Long getMerConfigId() {
-        return merConfigId;
-    }
-
-    public void setMerConfigId(Long merConfigId) {
-        this.merConfigId = merConfigId;
-    }
 }

fs-service/src/main/java/com/fs/his/domain/FsStorePayment.java

@@ -102,6 +102,15 @@ public class FsStorePayment extends BaseEntity
     //小程序appId
     private String appId;
 
+    private  Long merConfigId;
+    public Long getMerConfigId() {
+        return merConfigId;
+    }
+
+    public void setMerConfigId(Long merConfigId) {
+        this.merConfigId = merConfigId;
+    }
+