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

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

@@ -1786,7 +1786,7 @@
 						)
 					</if>
 				</if>-->
-				<if test="param == null">
+				<if test="param != null">
 					<!--数据权限判断-->
 					or a.CREATE_BY = #{param.createBy}
 					<if test="domains != null">

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java

@@ -114,7 +114,7 @@ public class TSalaryAccountExportVo {
 	/**
 	 * 支出信息结算状态 0 已结算 1 结算中 2 未结算
 	 */
-	@ExcelProperty("支出信息结算状态")
+	@ExcelProperty("支出结算状态")
 	private String paySettleFlag;
 
 }