From 0b343113e2fc93ae6679adadc075d92dbcf7f5c8 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 22 五月 2025 14:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
index 46eb05a..3751687 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelineCapacityPlan.java
@@ -2,9 +2,14 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.data.annotation.Id;
import java.math.BigDecimal;
@@ -14,12 +19,16 @@
* @author hjy
* @date 2025-04-24
*/
+@Data
@Schema(description = "姘斾綋绠¤矾浜ц兘瑙勫垝瀹炰綋绫�")
public class ApsGasPipelineCapacityPlan extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ @Id
+ @TableId(type = IdType.AUTO)
/** 涓婚敭id */
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
@Schema(description = "涓婚敭id", type = "Long")
private Long id;
@@ -58,6 +67,7 @@
@Schema(description = "鏃ヤ骇鍑哄崟浣�", type = "String")
private String dayProduceUnit;
+
/** 浜哄憳鏁伴噺 */
@Excel(name = "浜哄憳鏁伴噺")
@Schema(description = "浜哄憳鏁伴噺", type = "BigDecimal")
@@ -83,6 +93,12 @@
@Schema(description = "宸ュ巶浠ｇ爜", type = "String")
private String orgCode;
+
+ /** 杞﹂棿 */
+ @Excel(name = "杞﹂棿")
+ @Schema(description = "杞﹂棿", type = "String")
+ private String workshop;
+
public void setOrgCode(String orgCode)
{
this.orgCode = orgCode;
--
Gitblit v1.9.3