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

This commit is contained in:
zhangqinlin
2021-12-15 20:34:09 +08:00
@@ -131,7 +131,7 @@ public class TbCertificatePayment implements Serializable {
@Excel(name = "缴费状态", width = 15)
@ApiModelProperty(value = "缴费状态")
private Integer paymentStatus;
private String paymentStatus;
/**缴费记录*/
@Excel(name = "缴费记录", width = 15)