Skip to content

Y
yifu-mvp
Commit 922eaf59 authored by huyuchen's avatar huyuchen
Browse files
Options

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

parents 5f3441e1 efbf9fff
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @ 922eaf59
...@@ -1786,7 +1786,7 @@ ...@@ -1786,7 +1786,7 @@
) )
</if> </if>
</if>--> </if>-->
<if test="param == null"> <if test="param != null">
<!--数据权限判断--> <!--数据权限判断-->
or a.CREATE_BY = #{param.createBy} or a.CREATE_BY = #{param.createBy}
<if test="domains != null"> <if test="domains != null">
......
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryAccountExportVo.java
View file @ 922eaf59
...@@ -114,7 +114,7 @@ public class TSalaryAccountExportVo { ...@@ -114,7 +114,7 @@ public class TSalaryAccountExportVo {
/** /**
* 支出信息结算状态 0 已结算 1 结算中 2 未结算 * 支出信息结算状态 0 已结算 1 结算中 2 未结算
*/ */
@ExcelProperty("支出信息结算状态") @ExcelProperty("支出结算状态")
private String paySettleFlag; private String paySettleFlag;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment