diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java
index 0086f1a..284c065 100644
--- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java
+++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb.java
@@ -35,7 +35,7 @@ public class HwWeb extends BaseEntity
/** json字符串 */
@Excel(name = "字符串")
- private String webJsonStringEnglish;
+ private String webJsonEnglish;
public void setWebId(Long webId)
{
@@ -82,12 +82,12 @@ public class HwWeb extends BaseEntity
this.isDelete = isDelete;
}
- public String getWebJsonStringEnglish() {
- return webJsonStringEnglish;
+ public String getwebJsonEnglish() {
+ return webJsonEnglish;
}
- public void setWebJsonStringEnglish(String webJsonStringEnglish) {
- this.webJsonStringEnglish = webJsonStringEnglish;
+ public void setwebJsonEnglish(String webJsonEnglish) {
+ this.webJsonEnglish = webJsonEnglish;
}
@Override
@@ -98,7 +98,7 @@ public class HwWeb extends BaseEntity
.append("webJsonString", getWebJsonString())
.append("webCode", getWebCode())
.append("isDelete", getIsDelete())
- .append("webJsonStringEnglish", getWebJsonStringEnglish())
+ .append("webJsonEnglish", getwebJsonEnglish())
.toString();
}
}
diff --git a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java
index 3bb33d8..867739c 100644
--- a/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java
+++ b/ruoyi-modules/hw-portal/src/main/java/com/ruoyi/portal/domain/HwWeb1.java
@@ -39,7 +39,7 @@ public class HwWeb1 extends BaseEntity
/** json字符串 */
@Excel(name = "字符串")
- private String webJsonStringEnglish;
+ private String webJsonEnglish;
public void setWebId(Long webId)
{
@@ -102,12 +102,12 @@ public class HwWeb1 extends BaseEntity
this.isDelete = isDelete;
}
- public String getWebJsonStringEnglish() {
- return webJsonStringEnglish;
+ public String getwebJsonEnglish() {
+ return webJsonEnglish;
}
- public void setWebJsonStringEnglish(String webJsonStringEnglish) {
- this.webJsonStringEnglish = webJsonStringEnglish;
+ public void setwebJsonEnglish(String webJsonEnglish) {
+ this.webJsonEnglish = webJsonEnglish;
}
@Override
@@ -120,7 +120,7 @@ public class HwWeb1 extends BaseEntity
.append("deviceId", getDeviceId())
.append("typeId", getTypeId())
.append("isDelete", getIsDelete())
- .append("webJsonStringEnglish", getWebJsonStringEnglish())
+ .append("webJsonEnglish", getwebJsonEnglish())
.toString();
}
}
diff --git a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper.xml b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper.xml
index 283977a..c0cba77 100644
--- a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper.xml
+++ b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper.xml
@@ -10,12 +10,12 @@
-
+
select web_id, web_json, web_json_string, web_code,
- web_json_string_english,
+ web_json_english,
is_delete
from hw_web
@@ -28,7 +28,7 @@
and web_json = #{webJson}
and web_json_string = #{webJsonString}
and web_code = #{webCode}
- and web_json_string_english = #{webJsonStringEnglish}
+ and web_json_english = #{webJsonEnglish}
@@ -43,14 +43,14 @@
web_json,
web_json_string,
web_code,
- web_json_string_english,
+ web_json_english,
is_delete,
#{webJson},
#{webJsonString},
#{webCode},
- #{webJsonStringEnglish},
+ #{webJsonEnglish},
#{isDelete},
'0',
@@ -64,7 +64,7 @@
web_json = #{webJson},
web_json_string = #{webJsonString},
- web_json_string_english = #{webJsonStringEnglish},
+ web_json_english = #{webJsonEnglish},
where web_code = #{webCode}
diff --git a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper1.xml b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper1.xml
index 1e639fa..0c23c9d 100644
--- a/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper1.xml
+++ b/ruoyi-modules/hw-portal/src/main/resources/mapper/portal/HwWebMapper1.xml
@@ -12,12 +12,12 @@
-
+
select web_id, web_json, web_json_string, web_code,
- device_id, typeId, web_json_string_english,
+ device_id, typeId, web_json_english,
is_delete
from hw_web1
@@ -32,7 +32,7 @@
and web_code = #{webCode}
and device_id = #{deviceId}
and typeId = #{typeId}
- and web_json_string_english = #{webJsonStringEnglish}
+ and web_json_english = #{webJsonEnglish}
@@ -56,7 +56,7 @@
web_code,
device_id,
typeId,
- web_json_string_english,
+ web_json_english,
is_delete,
@@ -65,7 +65,7 @@
#{webCode},
#{deviceId},
#{typeId},
- #{webJsonStringEnglish},
+ #{webJsonEnglish},
#{isDelete},
'0',
@@ -81,7 +81,7 @@
- web_json_string_english = #{webJsonStringEnglish},
+ web_json_english = #{webJsonEnglish},
where web_code = #{webCode}
and device_id = #{deviceId}