From 727c30f11ede5b3c82ead6e09e5e077c0e7519f1 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 05 二月 2025 13:02:21 +0800
Subject: [PATCH] Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas into dev-20250116

---
 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ExamSiteAddForm.java |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ExamSiteAddForm.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ExamSiteAddForm.java
index 11ca06b..9b5b6c7 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ExamSiteAddForm.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ExamSiteAddForm.java
@@ -15,37 +15,37 @@
 @Data
 public class ExamSiteAddForm {
 
-	//考点名称
-	@ApiModelProperty(value = "考点名称",required = true)
-	@NotEmpty(message = "请输入考点名称")
-	private String siteName;
-	//地区id
-	@ApiModelProperty(value = "地区id",required = true)
-	@NotNull(message = "请选择地区")
-	private Long districtId;
-	//地址
-	@ApiModelProperty(value = "地址")
-	private String address;
-	//负责人
-	@ApiModelProperty(value = "负责人")
-	private String header;
-	//负责人电话
-	@ApiModelProperty(value = "负责人电话")
-	private String hphone;
-	//联系人
-	@ApiModelProperty(value = "联系人")
-	private String contact;
-	//联系人电话
-	@ApiModelProperty(value = "联系人电话")
-	private String cphone;
-	//是否为煤矿:0为非,1是
-	@ApiModelProperty(value = "是否为煤矿",required = true,notes = "0为非,1是")
-	@NotNull(message = "请选择是否为煤矿")
-	private Byte isCm;
-	//备注
-	@ApiModelProperty(value = "备注")
-	private String remark;
-	@ApiModelProperty(value = "机构id",required = true)
-	@NotNull(message = "请选择机构")
-	private Long institutionId;
+    //考点名称
+    @ApiModelProperty(value = "考点名称", required = true)
+    @NotEmpty(message = "请输入考点名称")
+    private String siteName;
+    //地区id
+    @ApiModelProperty(value = "地区id", required = true)
+    @NotNull(message = "请选择地区")
+    private Long districtId;
+    //地址
+    @ApiModelProperty(value = "地址")
+    private String address;
+    //负责人
+    @ApiModelProperty(value = "负责人")
+    private String header;
+    //负责人电话
+    @ApiModelProperty(value = "负责人电话")
+    private String hphone;
+    //联系人
+    @ApiModelProperty(value = "联系人")
+    private String contact;
+    //联系人电话
+    @ApiModelProperty(value = "联系人电话")
+    private String cphone;
+    //是否为煤矿:0为非,1是
+    @ApiModelProperty(value = "是否为煤矿", required = true, notes = "0为非,1是")
+    @NotNull(message = "请选择是否为煤矿")
+    private Byte isCm;
+    //备注
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    @ApiModelProperty(value = "机构id", required = false)
+//	@NotNull(message = "请选择机构")
+    private Long institutionId;
 }

--
Gitblit v1.9.2