Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

wuzeyu

2024-09-20 8e4ef1c73ab7e6840cc579d1bc4da767934ac020

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java

@@ -23,6 +23,7 @@
    private static final long serialVersionUID = 1L;

    @Schema(title = "ID")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long id;

    @Schema(title = "农户姓名")
@@ -46,9 +47,13 @@
    @Schema(title = "补卡金额")
    private Double reissueAmount;

    @Schema(title = "支付方式")
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long paymentId;
    //@Schema(title = "支付方式")
    //@JSONField(serializeUsing= ObjectWriterImplToString.class)
    //private Long paymentId;
    /**
     * 支付方式名称
     */
    private String paymentName;

    @Schema(title = "操作人")
    private String operator;