From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
index 9f4a0b3..1ce5e12 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
@@ -23,12 +23,6 @@
     private String name;
 
     /**
-     * 瀛︾
-     */
-    @TableField("subject_id")
-    private Integer subjectId;
-
-    /**
      * 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 2.闅忓嵆璇曞嵎 3.闅忓簭璇曞嵎)
      */
     @TableField("paper_type")
@@ -78,7 +72,7 @@
     private BigDecimal deductTypeScore;
 
     /**
-     * 澶氶�夎瘎鍒嗗垎鏁�
+     * 棰樼洰鏍煎紡
      * */
     @TableField("content")
     private String content;

--
Gitblit v1.8.0