Merge remote-tracking branch 'origin/develop' into develop

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceCompanyMapper.xml

@@ -15,6 +15,7 @@
             <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
             <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+            <result property="billingType" column="BILLING_TYPE" jdbcType="TINYINT"/>
 			<result property="insuranceHandleProvince" column="INSURANCE_HANDLE_PROVINCE" jdbcType="TINYINT"/>
 			<result property="insuranceHandleProvinceName" column="INSURANCE_HANDLE_PROVINCE_NAME" jdbcType="VARCHAR"/>
 			<result property="insuranceHandleCity" column="INSURANCE_HANDLE_CITY" jdbcType="TINYINT"/>
@@ -25,7 +26,7 @@
         ID,COMPANY_NAME,COMPANY_ADDRESS,
         COMPANY_DOCKING,CREATE_BY,CREATE_NAME,
         CREATE_TIME,UPDATE_BY,UPDATE_TIME,
-        DELETE_FLAG,
+        DELETE_FLAG,BILLING_TYPE,
 		INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME
     </sql>
 	<select id="getInsuranceCompanyListPage" resultMap="BaseResultMap">

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -616,10 +616,13 @@
 			a.DEPT_NO as deptNo,
 			a.DEPT_NAME as projectName,
 			a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
+		    a.INSURANCE_TYPE_NAME as insuranceTypeName,
+		    a.BUY_STANDARD as buyStandard,
 			a.POLICY_START as policyStart,
 			a.POLICY_END as policyEnd,
 			a.POLICY_NO as policyNo,
 			a.CREATE_NAME as createName,
+			a.BUY_TYPE as buyType,
 			refund.CREATE_USER_DEPT_NAME as createUserDeptName,
 			refund.CREATE_TIME as refundCreateTime,
 			a.CREATE_TIME as createTime