Merge remote-tracking branch 'origin/develop'

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentTaxSocialVo.java

@@ -86,7 +86,7 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
 	private BigDecimal paymentMoney;
 
 	/**
-	 * 人员编号
+	 * 人员编号（不导入）
 	 */
 	@ExcelAttribute(name = "人员编号")
 	@Schema(description = "人员编号")
@@ -97,7 +97,7 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
 	/**
 	 * 险种
 	 */
-	@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不可为空", maxLength = 10)
+	@ExcelAttribute(name = "险种", isNotEmpty = true, errorInfo = "险种不可为空", maxLength = 20)
 	@Schema(description = "险种")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "险种")
@@ -164,6 +164,8 @@ public class TPaymentTaxSocialVo extends RowIndex implements Serializable {
 	@Length(max = 32, message = "社保户不能超过32个字符")
 	@ExcelAttribute(name = "社保户", maxLength = 32)
 	@Schema(description = "社保户")
+	@ExcelProperty(value = "社保户")
+	@HeadFontStyle(fontHeightInPoints = 11)
 	private String socialHousehold;
 
 }