From df3082c22597e4da85e24077b8b584da3d89481f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Sep 2023 10:03:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87-=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=B7=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/standard/entity/LawsEnterpriseStandard.java      | 4 ++--
 .../standard/mapper/xml/LawsEnterpriseStandardMapper.xml  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
index 100c5bd0..b26fe996 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java
@@ -186,13 +186,13 @@ public class LawsEnterpriseStandard implements Serializable {
      * 代替标准号
      */
     @ApiModelProperty(value = "代替标准号")
-    private String substituteStandardNum;
+    private String substituteStandardNumber;
 
     /**
      * 被代替标准号
      */
     @ApiModelProperty(value = "被代替标准号")
-    private String replacedStandardNum;
+    private String replacedByStandardNumber;
 
     /**
      * 引用标准
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml
index dc78bd71..41211724 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsEnterpriseStandardMapper.xml
@@ -31,8 +31,8 @@
             <result property="mainDraftingUser" column="main_drafting_user" jdbcType="VARCHAR"/>
             <result property="mainDraftingUnit" column="main_drafting_unit" jdbcType="VARCHAR"/>
             <result property="mainDraftingUnitResponsiblePerson" column="main_drafting_unit_responsible_person" jdbcType="VARCHAR"/>
-            <result property="substituteStandardNum" column="substitute_standard_num" jdbcType="VARCHAR"/>
-            <result property="replacedStandardNum" column="replaced_standard_num" jdbcType="VARCHAR"/>
+            <result property="substituteStandardNumber" column="substitute_standard_number" jdbcType="VARCHAR"/>
+            <result property="replacedByStandardNumber" column="replaced_by_standard_number" jdbcType="VARCHAR"/>
             <result property="quotedStandard" column="quoted_standard" jdbcType="VARCHAR"/>
             <result property="referencedStandard" column="referenced_standard" jdbcType="VARCHAR"/>
             <result property="cooperationUnit" column="cooperation_unit" jdbcType="VARCHAR"/>
@@ -62,8 +62,8 @@
         grade_classification,release_date,implementation_date,
         comp_illustration,try_flag,trial_period,
         standard_state,standard_system,main_drafting_user,
-        main_drafting_unit,main_drafting_unit_responsible_person,substitute_standard_num,
-        replaced_standard_num,quoted_standard,referenced_standard,
+        main_drafting_unit,main_drafting_unit_responsible_person,substitute_standard_number,
+        replaced_by_standard_number,quoted_standard,referenced_standard,
         cooperation_unit,standard_promoter,part_name,
         standard_scope,acquisition_degree,relevent_document,
         international_standard_num,original_release,modification_form,