Merge remote-tracking branch 'origin/master'

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprOrganVO.java

@@ -34,9 +34,9 @@ public class AprOrganVO {
      */
     private String unifiedSocialCreditCode;
     /**
-     * 机构类型
+     * 机构类型名称
      */
-    private String organType;
+    private String organTypeName;
     /**
      * 机构地址
      */

governance/src/main/resources/com/hungraim/ltc/governance/mapper/AprOrganMapper.xml

@@ -19,11 +19,9 @@
         --统一社会信用代码
         organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
         --机构类型
-        organ.ORGAN_TYPE_ID organType,
+        organ.ORGAN_TYPE_NAME organTypeName,
         --统一社会信用代码
         organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
-        --机构类型
-        organType.ORGAN_TYPE_NAME organType,
         --机构地址
         organ.ACPT_PROVINCIAL acptProvincial,
         organ.ACPT_CITY acptCity,
@@ -39,8 +37,6 @@
         CH_APR_ORGAN organ
         --机构定义表
         LEFT JOIN CH_FND_ORGAN srvOrgan ON organ.organ_id = srvOrgan.organ_id
-        --鉴定机构类型表
-        LEFT JOIN CH_CFG_APR_ORGAN_TYPE organType ON organ.ORGAN_TYPE_ID = organType.ORGAN_TYPE_ID
         where organ.STATUS = 0
         <if test="organIds != null">
             and organ.organ_id in