From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/MwTransitRoutePoints.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwTransitRoutePoints.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwTransitRoutePoints.java
index 081e087..c14ea8a 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwTransitRoutePoints.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwTransitRoutePoints.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.sinata.common.entity.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -22,17 +21,25 @@
@Setter
@TableName("MW_TRANSIT_ROUTE_POINTS")
@ApiModel(value = "MwTransitRoutePoints对象", description = "转运线路途经点")
-public class MwTransitRoutePoints extends BaseModel {
+public class MwTransitRoutePoints {
- private static final long serialVersionUID = 1L;
@ApiModelProperty("转运线路途经点id")
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty("转运线路id")
+ @TableField("ROUTE_ID")
+ private Long routeId;
+
@ApiModelProperty("区域id（医院id）")
@TableField("DEPARTMENT_ID")
private Long departmentId;
+ @TableField(exist = false)
+ private String departmentName;
+ @TableField(exist = false)
+ @ApiModelProperty("是否标红1是")
+ private Integer isRed;
@ApiModelProperty("排序")
@TableField("SORT_ORDER")
--
Gitblit v1.7.1