From 5c364cbee84bded9e1beaa19fec7af51d25b1d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Wed, 15 Apr 2026 19:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E6=B0=B4=E5=8A=A0=E8=8D=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energy/pojo/entity/BsDosingRecEntity.java |  10 +++++-----
 .../Excel/QA/加药记录导入模板.xls     | Bin 19968 -> 19968 bytes
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java
index 2bb767b2..fc87ce31 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java
@@ -73,8 +73,8 @@ public class BsDosingRecEntity extends BaseEntity {
 	 * 加药时间
 	 */
 	@Schema(description = "加药时间")
-	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
-	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
+	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
+	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
 	private Date dosingTime;
 	/**
 	 * 加药人
@@ -89,18 +89,18 @@ public class BsDosingRecEntity extends BaseEntity {
 	/**
 	 * 处理类型
 	 */
-	@Schema(description = "处理类型")
+	//@Schema(description = "处理类型")
 	private Long handleResult;
 	/**
 	 * 类型：1、废气加药；2、废水加药
 	 */
-	@Schema(description = "类型：1、废气加药；2、废水加药")
+	//@Schema(description = "类型：1、废气加药；2、废水加药")
 	private String dorType;
 
 	/**
 	 * 酸雾塔
 	 */
-	@Schema(description = "酸雾塔")
+	//@Schema(description = "酸雾塔")
 	private Long btId;
 
 }
diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls
index 29b180316b972860d76fca76926a84620cc134e9..5995b7246164f94972fa0982fbe438f6b9f2ff5f 100644
GIT binary patch
delta 413
zcmW-d&nrYx6vxk*cjsX;Oq3xTP06p3hKS-Bo?oMB8d6yKl?A4m5(}aC%ED|p78X+^
zD<nJ%Y1Ax6S<FIK7XAPWi&08yYMeXw_BlT~r|&uUnh7)$coPv$^X=mHCG&wE07%i6
zFwjSTB9A}xXKyP}0PE(AMb8=ysM8cyU39GWitG7ktM#t_cHuL<_6@sdpd26@W(5E>
z+bEq2K#*6fC9f!^QO$#XTGf1R);pby?LCHUfJL*Pkvuq{7`Ev_>%b=Z(k8Il()v?M
zsbCG1LLdY=^q<3_DXg+4hA#1LBx}PoeUG)&>~Pu1#F+}_h^b_f^b~YcFyLyibCz4r
z95jb=>l}h#n!&Q_<jE@*;?XntdNKlilnOl9(nvmi+)9tfv8S8otFoU@HzU_MmkEG*
z#m2_mGYTV%a%C@jg?58_z0CL%K!*j0z!Ge-U4RW(ffz(#vXC$Ho`$m>I-#9!CwJR<
G{Qf`3P-MIS

delta 367
zcmWlT&r1SP5XWcMb^C#4)WITzFsMU8y9kDmo3te=OJ#?wV?j5`=!X>;Em$CgAk3wM
zQ1>pC7qJMT{s4~=LDw$D20;j+&3o{9^S-=!pEp(+tuo%EWw%;<Jdf<Zp&tM&I+9Ot
zlA3ZGZE89vJqn-+o3I5L$TFlU>vW+^%hq;Et-L6|L42Y{c;34N9soPW4gkd-7R3eN
zpb3457Ii;HX-C(5Y`a>{<ZBD>snO!ph6LEL_K|KwH*~@-)${<4(U+b?UnMeAceo_B
zpiqG%k<0j@ma&4Z+vGLgMQsV|^c@=?JmhOPbISBFC8nRL(x>SqGu}HQbDD!yFu6t;
znC%&OxNM*}TO~R;&c0GU9wt?msUELN1tiT#RGt$B)c&}~$%v&gVw^n@_-T$eF{1d{
X!8AmsGt(g3%ynrHgaCvf#IpN;0BBuM