Merge branch '陈航-新增字段得用所在行政区划' of sckj/mz-cloud into master

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/organization/domain/YljgJcxx.java

@@ -651,7 +651,7 @@ public class YljgJcxx extends BaseEntity
 
     /** 单位所属行政区划  name拼接 */
     @TableField(exist = false)
-    private String ssxzqhNames;
+    private String szxzqhNames;
 
     /** 单位所在行政区划 id拼接 */
     @TableField(exist = false)

ruoyi-api/ruoyi-api-ext/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -519,7 +519,7 @@ public class YljgsqJcxx extends BaseEntity
 
     /** 单位所属行政区划 */
     @TableField(exist = false)
-    private String ssxzqhNames;
+    private String szxzqhNames;
 
     /** 单位所在行政区划 */
     @TableField(exist = false)

ruoyi-modules/mz-organization/src/main/resources/mapper/organization/YljgJcxxMapper.xml

@@ -110,13 +110,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
         <result property="ssxzqhName"    column="ssxzqh_name"    />
-        <result property="ssxzqhNames"    column="ssxzqh_names"    />
+        <result property="szxzqhNames"    column="szxzqh_names"    />
         <result property="szxzqhName"    column="szxzqh_name"    />
     </resultMap>
 
         <sql id="selectYljgJcxxVo">
             select
-            getxzqhmcbycode(a.ssxzqh) as ssxzqh_names,
+            getxzqhmcbycode(a.szxzqh) as szxzqh_names,
             a.id, a.zzjgdm, a.tyshxydm, a.jg_url, a.lat, a.lng, a.jgmc, a.jlrq, a.czyy, a.czsj,
             a.ssxzqh, a.szxzqh, a.txdz, a.frxm, a.frlxfs, a.frzjlx, a.frzjhm, a.frdjjg, a.frlx,
             a.qtcws, a.rtcws, a.hlxcws, a.cwzs, a.jzmj, a.zdmj, a.csxz, a.is_xfsy_zt, a.xfsy_yy, a.xfsy_yj,

ruoyi-modules/mz-organization/src/main/resources/mapper/organization/YljgsqJcxxMapper.xml

@@ -90,15 +90,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="state"    column="state"    />
         <result property="ssxzqhName"    column="ssxzqh_name"    />
-        <result property="ssxzqhNames"    column="ssxzqh_names"    />
         <result property="szxzqhName"    column="szxzqh_name"    />
+        <result property="szxzqhNames"    column="szxzqh_names"    />
     </resultMap>
 
     <sql id="selectYljgsqJcxxVo">
         select
         getxzqhidbycode(szxzqh) szxzqh,
         getxzqhmcbycode(szxzqh) as szxzqh_name,
-        getxzqhmcbycode(ssxzqh) as ssxzqh_names,
+        getxzqhmcbycode(szxzqh) as ssxzqh_names,
         id, tyshxydm, jg_url, lat, lng, zzjgdm, jgmc, jlrq, ssxzqh, czyy, czsj, sczt,
         is_zfmftg, is_cszfmftg, rzlnrs, zllnrszfy, bfsnlnrszfy, snlnrszfy, is_xssfjm, is_yshllyy, is_nrmzbmtyjg, is_qyylzx, fwrc, tgfwlx,
         txdz, frxm, frlxfs, frzjlx, frzjhm, frdjjg, frlx, qtcws,