解决git冲突

liurunyu

2024-07-25 a37271af0a5a2eb04ca23c80cca32567c968fa8e

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java

@@ -69,11 +69,11 @@
    private Double gift;

    /**
     * 总额
     * 返还金额
     */
    @Schema(description = "总额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @NotNull(message = "总额不能为空")
    private Double totalAmount;
    @Schema(description = "返还金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @NotNull(message = "返还金额不能为空")
    private Double refundAmount;

    /**
     * 交易日期