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

yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties

-insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+#insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+insurance.insuranceUrl=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 insurance.insuranceFdModelId=181d73279372e5a55438a47d7436ab7e
 insurance.insuranceFdFlowId=18267f206233f29cbd3c5ee425c9408a
 insurance.insuranceDocStatus=20

yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties

-ekporder.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+#ekporder.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+ekporder.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 ekporder.orderFdModelId=182f1b7ffe2e96f975564e44e559847d
 ekporder.orderFdFlowId=182f1c098ce991ca96bc927408792beb
 ekporder.replyFdModelId=182f1bb35bb2156fb9a02904bc88dd8a

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -277,6 +277,10 @@ public class InsurancesConstants {
 	 * 购买标准不存在
 	 */
 	public static final String BUY_STANDARD_NOT_EXIST = "购买标准不存在";
+	/**
+	 * 购买标准格式错误
+	 */
+	public static final String BUY_STANDARD_PARSE_ERROR = "购买标准格式错误";
 	/**
 	 * 商险购买地省名称不能为空
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceCompany.java

@@ -70,4 +70,28 @@ public class TInsuranceCompany extends BaseEntity {
 	@Schema(description = "是否删除 0否/1是")
     private Integer deleteFlag;
 
+	/**
+	 * 商险办理省code
+	 */
+	@Schema(description = "商险办理省code")
+	private Integer insuranceHandleProvince;
+
+	/**
+	 * 商险办理省
+	 */
+	@Schema(description = "商险办理省")
+	private String insuranceHandleProvinceName;
+
+	/**
+	 * 商险办理城市code
+	 */
+	@Schema(description = "商险办理城市code")
+	private Integer insuranceHandleCity;
+
+	/**
+	 * 商险办理城市
+	 */
+	@Schema(description = "商险办理城市")
+	private String insuranceHandleCityName;
+
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRegisterParam.java

@@ -50,6 +50,12 @@ public class InsuranceRegisterParam implements Serializable {
 	@Schema(description = "保单结束时间")
 	private String policyEnd;
 
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
 	/**
 	 * 保单编号
 	 */

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

@@ -15,12 +15,17 @@
             <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="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"/>
+			<result property="insuranceHandleCityName" column="INSURANCE_HANDLE_CITY_NAME" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         ID,COMPANY_NAME,COMPANY_ADDRESS,
         COMPANY_DOCKING,CREATE_BY,CREATE_NAME,
         CREATE_TIME,UPDATE_BY,UPDATE_TIME,
-        DELETE_FLAG
+        DELETE_FLAG,
+		INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME
     </sql>
 </mapper>