add 所有表格添加 创建人、修改人、创建时间、修改时间

fix 循环依赖

coffee-common/src/main/java/com/coffee/common/entity/GenericEntity.java

@@ -1,18 +1,32 @@
 package com.coffee.common.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 
-public abstract class  GenericEntity<PK> implements Entity {
+import java.util.Date;
+
+@Data
+public abstract class  GenericEntity<PK> implements Entity,RecordModifierEntity,RecordCreationEntity {
     private static final long serialVersionUID = 1L;
 
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-    @Getter
-    @Setter
     private PK id;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
 }

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceEntity.java

@@ -30,7 +30,7 @@ import java.util.Date;
 @TableName(value = "bus_device",autoResultMap = true)
 @ApiModel(value="设备经销商管理", description="设备与医院关系管理")
 @ToString
-public class BusDeviceEntity extends TenantGenericEntity<String,String> implements RecordCreationEntity, RecordModifierEntity {
+public class BusDeviceEntity extends TenantGenericEntity<String,String> {
 
 
     @ApiModelProperty(value = "设备唯一id")
@@ -59,18 +59,6 @@ public class BusDeviceEntity extends TenantGenericEntity<String,String> implemen
     @ApiModelProperty(value = "是否启用,0、不启用 1、启用 ")
     private Boolean enable;
 
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date createTime;
-
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String createBy;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateBy;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
 
     @TableField(fill = FieldFill.INSERT)
     @TableLogic(value = "0",delval = "1")

coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalConfigEntity.java

@@ -27,7 +27,7 @@ import java.util.Map;
 @Data
 @TableName(value = "bus_hospital_config",autoResultMap = true)
 @ApiModel(value="医院配置", description="配置医院的全局参数，如撤泵配置、评价配置等")
-public class BusHospitalConfigEntity extends TenantGenericEntity<String,String> implements RecordModifierEntity, RecordCreationEntity {
+public class BusHospitalConfigEntity extends TenantGenericEntity<String,String>  {
 
 
     @ApiModelProperty(value = "配置类型",example = "eval:评价配置,other:其他设置,undo:撤泵配置",allowableValues = "eval:评价配置,other:其他设置,undo:撤泵配置")
@@ -37,15 +37,4 @@ public class BusHospitalConfigEntity extends TenantGenericEntity<String,String>
     @ApiModelProperty(value = "配置类型", example= "详情请查看apiModel中:评价配置,其他设置,撤泵配置")
     private Map<String,Object> config;
 
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
 }

coffee-system/src/main/java/com/coffee/bus/entity/BusInfusionHistoryEntity.java

@@ -223,18 +223,6 @@ public class BusInfusionHistoryEntity extends TenantGenericEntity<String,String>
     @ApiModelProperty(value = "该次输注是否已结束")
     private Boolean finished;
 
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date createTime;
-
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String createBy;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateBy;
-
-    @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
-
     @TableField(fill = FieldFill.INSERT)
     @TableLogic(value = "0",delval = "1")
     private Integer isDelete;

coffee-system/src/main/java/com/coffee/bus/service/LocalBusPatientService.java

@@ -38,7 +38,6 @@ import java.util.*;
  * @createTime 2022年03月19日 09:27:00
  */
 @Service
-@AllArgsConstructor
 @Slf4j
 public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPatientEntity,String> {
     @Autowired