From a954287ddcfe800adb6110bafc6a33a65206211a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 26 Feb 2021 11:09:17 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/EquipmentDocking.java | 145 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 72 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/EquipmentDocking.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/EquipmentDocking.java
index b24a964..94bbd69 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/EquipmentDocking.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/EquipmentDocking.java
@@ -15,11 +15,12 @@
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: <br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-10-19 11:14:58 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,76 +28,76 @@
@AllArgsConstructor
@TableName("equipment_docking")
public class EquipmentDocking extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 医院名称
- */
- @NotEmpty(message = "医院名称不能为空")
- private String hospitalName;
- /**
- * 科室名称
- */
- @NotEmpty(message = "科室名称不能为空")
- private String departName;
- /**
- * 医院唯一标识
- */
- @NotNull(message = "医院唯一标识不能为空")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long hospitalId;
- /**
- * 部门唯一表示
- */
- @NotNull(message = "部门唯一表示不能为空")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long departId;
- /**
- * 设备厂家名称
- */
- @NotEmpty(message = "设备厂家名称不能为空")
- private String companyName;
- /**
- * 设备型号
- */
- @NotEmpty(message = "设备型号不能为空")
- private String unitType;
- /**
- * 设备品牌
- */
- @NotEmpty(message = "设备品牌不能为空")
- private String equipmentBrand;
- /**
- * 设备机器码
- */
- @NotEmpty(message = "设备机器码不能为空")
- private String machineCode;
- /**
- * hospital_id+depart_id+machine_code 进行md5加密生成的32位小写的字符串
- */
+ /**
+ * 医院名称
+ */
+ @NotEmpty(message = "医院名称不能为空")
+ private String hospitalName;
+ /**
+ * 科室名称
+ */
+ @NotEmpty(message = "科室名称不能为空")
+ private String departName;
+ /**
+ * 医院唯一标识
+ */
+ @NotNull(message = "医院唯一标识不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long hospitalId;
+ /**
+ * 部门唯一表示
+ */
+ @NotNull(message = "部门唯一表示不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long departId;
+ /**
+ * 设备厂家名称
+ */
+ @NotEmpty(message = "设备厂家名称不能为空")
+ private String companyName;
+ /**
+ * 设备型号
+ */
+ @NotEmpty(message = "设备型号不能为空")
+ private String unitType;
+ /**
+ * 设备品牌
+ */
+ @NotEmpty(message = "设备品牌不能为空")
+ private String equipmentBrand;
+ /**
+ * 设备机器码
+ */
+ @NotEmpty(message = "设备机器码不能为空")
+ private String machineCode;
+ /**
+ * hospital_id+depart_id+machine_code 进行md5加密生成的32位小写的字符串
+ */
// @NotEmpty(message = "hospital_id+depart_id+machine_code 进行md5加密生成的32位小写的字符串不能为空")
- private String outAccesskey;
- /**
- * 设备厂家联系人电话
- */
- @NotEmpty(message = "设备厂家联系人电话不能为空")
- private String contactPhone;
- /**
- * 设备厂家联系人名称
- */
- @NotEmpty(message = "设备厂家联系人名称不能为空")
- private String contactName;
- /**
- * 备注信息
- */
- private String remarkComment;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- /**
- * 是否删除，1删除，0未删除
- */
- @TableLogic
- private Boolean isDel;
- }
+ private String outAccesskey;
+ /**
+ * 设备厂家联系人电话
+ */
+ @NotEmpty(message = "设备厂家联系人电话不能为空")
+ private String contactPhone;
+ /**
+ * 设备厂家联系人名称
+ */
+ @NotEmpty(message = "设备厂家联系人名称不能为空")
+ private String contactName;
+ /**
+ * 备注信息
+ */
+ private String remarkComment;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @TableLogic
+ private Boolean isDel;
+}
--
Gitblit v1.8.0