From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
index ce1e4c1..5fa4ee6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
@@ -1,14 +1,14 @@
package com.dsh.course.entity;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -23,7 +23,7 @@
@Accessors(chain = true)
@TableName("t_course_package_payment")
public class TCoursePackagePayment {
-
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -45,7 +45,7 @@
/**
* 支付方式（1=现金，2=玩湃币）
*/
- private Integer payType;
+ private String payType;
/**
* 课时数
*/
--
Gitblit v1.7.1