Merge branch 'refs/heads/local' into test

yd-user-service/src/main/java/com/yd/user/service/model/MdCountry.java

@@ -39,6 +39,7 @@ public class MdCountry implements Serializable {
     /**
     /**
      * 联系电话
      * 联系电话
      */
      */
+    @TableField(value = "`group`")
     private String group;
     private String group;
 
 
     /**
     /**

yd-user-service/src/main/resources/mappers/MdCountryMapper.xml

@@ -9,7 +9,7 @@
             <result property="countryBizId" column="country_biz_id" />
             <result property="countryBizId" column="country_biz_id" />
             <result property="name" column="name" />
             <result property="name" column="name" />
             <result property="countryCode" column="country_code" />
             <result property="countryCode" column="country_code" />
-            <result property="group" column="groupValue" />
+            <result property="group" column="`group`" />
             <result property="areaCode" column="area_code" />
             <result property="areaCode" column="area_code" />
             <result property="hotRank" column="hot_rank" />
             <result property="hotRank" column="hot_rank" />
             <result property="remark" column="remark" />
             <result property="remark" column="remark" />
@@ -21,7 +21,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
-        id,country_biz_id,`name`,country_code,`group` as groupValue,area_code,
+        id,country_biz_id,`name`,country_code,`group`,area_code,
         hot_rank,remark,is_deleted,creator_id,updater_id,
         hot_rank,remark,is_deleted,creator_id,updater_id,
         create_time,update_time
         create_time,update_time
     </sql>
     </sql>