Skip to content

Y
yifu-mvp
Commit 36c83011 authored by huyuchen's avatar huyuchen
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 9ac0fb46 94cb1163
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
View file @ 36c83011
...@@ -348,7 +348,7 @@ public class TSettleDomain extends BaseEntity { ...@@ -348,7 +348,7 @@ public class TSettleDomain extends BaseEntity {
@Schema(description = "公积金类型0：缴费库；1：预估库") @Schema(description = "公积金类型0：缴费库；1：预估库")
private String fundType; private String fundType;
/** /**
* 商险结算类型0 合并 1 单独 * 商险结算类型0 合并（预估） 1 单独（实缴）
*/ */
@ExcelAttribute(name = "商险结算类型0 合并 1 单独") @ExcelAttribute(name = "商险结算类型0 合并 1 单独")
@ExcelProperty("商险结算类型0 合并 1 单独") @ExcelProperty("商险结算类型0 合并 1 单独")
......
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