Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

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

@@ -210,8 +210,8 @@ public class InsuranceWarnExportVo implements Serializable {
 	 * 商险购买地
 	 */
 	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value = "商险购买地市")
-	@Schema(name = "商险购买地市")
+	@ExcelProperty(value = "商险办理地市")
+	@Schema(name = "商险办理地市")
 	private String insuranceHandleCityName;
 	/**
 	 * 是否有效 0有效 1无效

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

@@ -218,6 +218,13 @@ public class TBusinessInsuranceVo implements Serializable {
 	@ExcelProperty(value = "商险购买地市")
 	@Schema(name = "商险购买地市")
 	private String insuranceCityName;
+	/**
+	 * 商险购买地
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "商险办理地市")
+	@Schema(name = "商险办理地市")
+	private String insuranceHandleCityName;
 	/**
 	 * 是否有效 0有效 1无效
 	 */

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

@@ -1843,7 +1843,7 @@
 		LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
 	</select>
 	<select id="noPageDiy" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceWarnExportVo">
-		<include refid="expire_export_sql_param"/>
+		<include refid="expire_export_sql_param"/>,a.INSURANCE_HANDLE_CITY_NAME
 		from
 		(select * from t_insurance_detail a
 		<include refid="expire_sql_where"/>