解决冲突

liurunyu

2024-07-25 7af935e6a092193adf309f3a2d700f049b4b63d8

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

@@ -48,8 +48,10 @@
     */
    private Float money;

    @Schema(title = "水卡编号")
    private String cardNum;
    @JSONField(serializeUsing= ObjectWriterImplToString.class)
    private Long cardNum;

    private Integer cardCost;

    @Schema(title = "充值金额")
    private Float amount;