From 28a364ed2f9e274b56107c81b69a667ffe315d7e Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 28 Apr 2022 10:28:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E7=B4=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xhm/ynedu/domain/YnExaminationRoom.java   | 2 +-
 .../src/main/resources/mapper/ynedu/YnSubjectMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ynexam-ynedu/src/main/java/com/xhm/ynedu/domain/YnExaminationRoom.java b/ynexam-ynedu/src/main/java/com/xhm/ynedu/domain/YnExaminationRoom.java
index fb842ea..771e451 100644
--- a/ynexam-ynedu/src/main/java/com/xhm/ynedu/domain/YnExaminationRoom.java
+++ b/ynexam-ynedu/src/main/java/com/xhm/ynedu/domain/YnExaminationRoom.java
@@ -39,7 +39,7 @@ public class YnExaminationRoom extends BaseEntity
 
     /** 创建时间 */
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern ="yyyy-MM-dd HH:mm:ss")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdTime;
 
diff --git a/ynexam-ynedu/src/main/resources/mapper/ynedu/YnSubjectMapper.xml b/ynexam-ynedu/src/main/resources/mapper/ynedu/YnSubjectMapper.xml
index b88ae9d..e4fef2e 100644
--- a/ynexam-ynedu/src/main/resources/mapper/ynedu/YnSubjectMapper.xml
+++ b/ynexam-ynedu/src/main/resources/mapper/ynedu/YnSubjectMapper.xml
@@ -112,11 +112,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrument != null">instrument = #{instrument},</if>
             <if test="score != null">score = #{score},</if>
             <if test="weight != null">weight = #{weight},</if>
-            <if test="stationCode != null">station_code = #{stationCode}</if>
             <if test="deletedTime != null">deleted_time = #{deletedTime},</if>
             <if test="createdBy != null">created_by = #{createdBy},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
             updated_time = now(),
         </trim>
         where id = #{id}