ソースを参照

Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java
5 年 前
コミット
c042065039
1 ファイル変更3 行追加1 行削除
  1. 3 1
      cloud-model/src/main/resources/mapper/CompanyMapper.xml

+ 3 - 1
cloud-model/src/main/resources/mapper/CompanyMapper.xml

@@ -22,6 +22,8 @@
         <result column="company_name" property="companyName" />
         <result column="company_address" property="companyAddress" />
         <result column="companytype" property="companyType" />
+        <result column="administrator_id" property="administratorId" />
+        <result column="administrator" property="administrator" />
         <result column="y_lng" property="yLng" />
         <result column="x_lat" property="xLat" />
         <collection property="relateCompanyList" javaType="java.util.List" select="selectRelateCompanyList"
@@ -56,7 +58,7 @@
     <!--</select>-->
     <select id="getCustomerListByKeyName" resultMap="BaseResultMapVO">
         select
-        t.id, t.company_name, t.company_address, t.company_type companytype,tc.y_lng, tc.x_lat
+        t.id, t.company_name, t.company_address, t.company_type companytype,t.administrator_id,t.administrator,tc.y_lng, tc.x_lat
         from
         tb_company t
         left join