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

yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSocialInfoMapper.xml

@@ -123,7 +123,7 @@
 			fd_3b573843db30ce
 		from ekp_79c234bf64d412294f23
 		where fd_3b62f3470beb30 = '1302010109024596014'
-		and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d')
+		and DATE_FORMAT(fd_3aa4531d3b86e0, '%Y-%m-%d') between DATE_SUB(curdate(), INTERVAL 1 day) and DATE_ADD(now(), INTERVAL 1 day)
 		and fd_3b57f8de9df354 = '是'
 	</select>
 </mapper>

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

@@ -1855,7 +1855,7 @@
 		LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
 		LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
 		<include refid="expire_sql_where"/>
-		order by a.CREATE_TIME desc
+		order by a.POLICY_END asc
 	</select>
 
 	<select id="pageDiyHistory" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo">
@@ -1928,7 +1928,7 @@
 		LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
 		LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
 		<include refid="expire_sql_where"/>
-		order by a.CREATE_TIME desc
+		order by a.POLICY_END asc
 		<if test="param != null and param.limitStart != null">
 			limit #{param.limitStart},#{param.limitEnd}
 		</if>
@@ -1944,11 +1944,10 @@
 		LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
 		<include refid="expire_sql_where"/>
 		group by a.id
-		order by a.CREATE_TIME desc
+		order by a.POLICY_END asc
 		<if test="param != null and param.limitStart != null">
 			limit #{param.limitStart},#{param.limitEnd}
 		</if>
-
 	</select>
 	<select id="noPageCountDiy" resultType="java.lang.Integer">
 		select