From cd3e490b95b7e6130c506b47debc5ca004bc01f2 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 15:36:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
index 6986fd7..e6f7157 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsStandardProcess.java
@@ -2,9 +2,13 @@
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 org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.data.annotation.Id;
import java.math.BigDecimal;
@@ -20,6 +24,10 @@
{
private static final long serialVersionUID = 1L;
+ @Id
+ @TableId(type = IdType.AUTO)
+ /** 涓婚敭id */
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
/** 涓婚敭id */
@Schema(description = "涓婚敭id", type = "Long")
private Long id;
@@ -38,6 +46,10 @@
@Schema(description = "璧勬簮缁�", type = "String")
@Excel(name = "璧勬簮缁�")
private String resourceGroupName;
+ /** 涓撲笟 */
+ @Schema(description = "涓撲笟", type = "String")
+ @Excel(name = "涓撲笟")
+ private String major;
/** 浜ц兘妯″瀷: 鐙崰/鍚堟壒 */
@Schema(description = "浜ц兘妯″瀷", type = "String")
@@ -55,8 +67,8 @@
private String plantId;
/** 宸ュ巶 */
- @Schema(description = "宸ュ巶", type = "String")
- @Excel(name = "宸ュ巶")
+ @Schema(description = "閫傜敤宸ュ巶", type = "String")
+ @Excel(name = "閫傜敤宸ュ巶")
private String plant;
/** 杞﹂棿Id */
@@ -65,8 +77,8 @@
private String workShopId;
/** 杞﹂棿 */
- @Schema(description = "杞﹂棿", type = "String")
- @Excel(name = "杞﹂棿")
+ @Schema(description = "閫傜敤杞﹂棿", type = "String")
+ @Excel(name = "閫傜敤杞﹂棿")
private String workShop;
/** 鏃ュ巻Id */
@@ -74,24 +86,22 @@
// @Excel(name = "鏃ュ巻Id")
private Long workCalenderId;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- @Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�", type = "String")
- private String delFlag;
+ /** 鏃ュ巻鎻忚堪 */
+ @Schema(description = "鏃ュ巻鎻忚堪", type = "String")
+ @Excel(name = "鏃ュ巻鎻忚堪")
+ private String workCalender;
/** 浜ц兘妯″瀷Id */
@Schema(description = "浜ц兘妯″瀷Id", type = "Long")
// @Excel(name = "浜ц兘妯″瀷Id")
private Long modelId;
- /** 鏃ュ巻鎻忚堪 */
- @Schema(description = "鏃ュ巻鎻忚堪", type = "String")
- @Excel(name = "鏃ュ巻鎻忚堪")
- private String workCalender;
- /** 涓撲笟 */
- @Schema(description = "涓撲笟", type = "String")
- @Excel(name = "涓撲笟")
- private String major;
+ /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ @Schema(description = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�", type = "String")
+ private String delFlag;
+
+
public String getMajor() {
return major;
--
Gitblit v1.9.3