Merge remote-tracking branch 'origin/dev_price' into dev_price

src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java

@@ -6,17 +6,19 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
-    * 患者信息
-    */
-@ApiModel(value="com-glxp-api-entity-basic-BasicSkSicker")
+ * 患者信息
+ */
+@ApiModel(value = "com-glxp-api-entity-basic-BasicSkSicker")
 @Data
 @Builder
 @AllArgsConstructor
@@ -28,141 +30,139 @@ public class BasicSkSickerEntity {
      * 患者编码
      */
     @TableId(value = "code")
-    @ApiModelProperty(value="患者编码")
+    @ApiModelProperty(value = "患者编码")
     private String code;
 
     /**
      * 姓名
      */
     @TableField(value = "`name`")
-    @ApiModelProperty(value="姓名")
+    @ApiModelProperty(value = "姓名")
     private String name;
 
     /**
      * 住院号
      */
     @TableField(value = "adNum")
-    @ApiModelProperty(value="住院号")
+    @ApiModelProperty(value = "住院号")
     private String adNum;
 
     /**
      * 身份证号
      */
     @TableField(value = "idNum")
-    @ApiModelProperty(value="身份证号")
+    @ApiModelProperty(value = "身份证号")
     private String idNum;
 
     /**
      * 手机号
      */
     @TableField(value = "phone")
-    @ApiModelProperty(value="手机号")
+    @ApiModelProperty(value = "手机号")
     private String phone;
 
     /**
      * 性别
      */
     @TableField(value = "gender")
-    @ApiModelProperty(value="性别")
+    @ApiModelProperty(value = "性别")
     private String gender;
 
     /**
      * 职业
      */
     @TableField(value = "job")
-    @ApiModelProperty(value="职业")
+    @ApiModelProperty(value = "职业")
     private String job;
 
     /**
-     * 出生年月
+     * 出生年月日
      */
     @TableField(value = "bornDate")
-    @ApiModelProperty(value="出生年月")
+    @ApiModelProperty(value = "出生年月日")
     private String bornDate;
 
     /**
      * 国籍
      */
     @TableField(value = "nationality")
-    @ApiModelProperty(value="国籍")
+    @ApiModelProperty(value = "国籍")
     private String nationality;
 
     /**
      * 文化程度
      */
     @TableField(value = "education")
-    @ApiModelProperty(value="文化程度")
+    @ApiModelProperty(value = "文化程度")
     private String education;
 
     /**
      * 监护人
      */
     @TableField(value = "guardianName")
-    @ApiModelProperty(value="监护人")
+    @ApiModelProperty(value = "监护人")
     private String guardianName;
 
     /**
      * 监护人与患者关系
      */
     @TableField(value = "guardianRel")
-    @ApiModelProperty(value="监护人与患者关系")
+    @ApiModelProperty(value = "监护人与患者关系")
     private String guardianRel;
 
     /**
      * 现居住地
      */
     @TableField(value = "curAddr")
-    @ApiModelProperty(value="现居住地")
+    @ApiModelProperty(value = "现居住地")
     private String curAddr;
 
     /**
      * 户籍地
      */
     @TableField(value = "kosekiAddr")
-    @ApiModelProperty(value="户籍地")
+    @ApiModelProperty(value = "户籍地")
     private String kosekiAddr;
 
     /**
-     * 医保
+     * 医保卡号
      */
     @TableField(value = "medicalIns")
-    @ApiModelProperty(value="医保")
+    @ApiModelProperty(value = "医保")
     private String medicalIns;
 
     /**
      * 创建人
      */
     @TableField(value = "`createUser`")
-    @ApiModelProperty(value="创建人")
+    @ApiModelProperty(value = "创建人")
     private String createUser;
 
     /**
      * 创建时间
      */
     @TableField(value = "createTime")
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 更新人
      */
     @TableField(value = "updateUser")
-    @ApiModelProperty(value="更新人")
+    @ApiModelProperty(value = "更新人")
     private String updateUser;
 
     /**
      * 更新时间
      */
     @TableField(value = "updateTime")
-    @ApiModelProperty(value="更新时间")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     /**
      * 备注
      */
     @TableField(value = "remark")
-    @ApiModelProperty(value="备注")
+    @ApiModelProperty(value = "备注")
     private String remark;
-
-    private static final long serialVersionUID = 1L;
 }