Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:订单列表新增唯一字段用于前端渲染"

See merge request fangxinjiang/yifu!226

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -25,6 +22,12 @@ public class InsuredOrderListVo implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
+	/**
+	 * 唯一id
+	 */
+	@Schema(description = "唯一id")
+	private String onlyId;
+
 	/**
 	 * 投保类型， 1新增、3批增、4替换
 	 */

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

@@ -943,6 +943,7 @@
 		(
 		select
 			detail.id as id,
+			detail.id as onlyId,
 			detail.BUY_TYPE as buyType,
 			detail.CREATE_BY as createBy,
 			detail.EMP_NAME as empName,
@@ -984,6 +985,7 @@
 		union all(
 		select
 			detail.id as id,
+			refund.id as onlyId,
 			refund.BUY_TYPE as buyType,
 			refund.CREATE_BY as createBy,
 			detail.EMP_NAME as empName,