Merge branch 'refs/heads/local' into test

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

@@ -21,7 +21,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,country_biz_id,name,country_code,`group`,area_code,
+        id,country_biz_id,`name`,country_code,`group`,area_code,
         hot_rank,remark,is_deleted,creator_id,updater_id,
         create_time,update_time
     </sql>