From 6e006cb835fce4720139de0cc2ec3be734295ed9 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期六, 12 七月 2025 14:18:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java index 435c04f..6712847 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrderDetail.java @@ -24,7 +24,7 @@ @Accessors(chain = true) @ApiModel(value="eam_second_maintenance_order_detail瀵硅薄", description="璁惧浜岀骇淇濆吇鏄庣粏") public class EamSecondMaintenanceOrderDetail implements Serializable { - + /**涓婚敭*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "涓婚敭") @@ -51,28 +51,19 @@ @Excel(name = "椤圭洰搴忓彿", width = 15) @ApiModelProperty(value = "椤圭洰搴忓彿") private Integer itemCode; - /**淇濆吇椤圭洰*/ - @Excel(name = "淇濆吇椤圭洰", width = 15) - @ApiModelProperty(value = "淇濆吇椤圭洰") + /** 淇濆吇鍒嗙被;鎿嶄綔宸ャ�佺淮淇伐 */ + @ApiModelProperty(name = "淇濆吇鍒嗙被",notes = "鎿嶄綔宸ャ�佺淮淇伐") + private String itemCategory; + /** 淇濆吇鍐呭 */ + @ApiModelProperty(name = "淇濆吇鍐呭",notes = "") private String itemName; - /**閮ㄤ綅*/ - @Excel(name = "閮ㄤ綅", width = 15) - @ApiModelProperty(value = "閮ㄤ綅") - private String itemPart; - /**淇濆吇瑕佹眰*/ - @Excel(name = "淇濆吇瑕佹眰", width = 15) - @ApiModelProperty(value = "淇濆吇瑕佹眰") - private String itemDemand; - /**淇濆吇缁撴灉*/ - @Excel(name = "淇濆吇缁撴灉", width = 15) - @ApiModelProperty(value = "淇濆吇缁撴灉") + /** 淇濆吇缁撴灉 */ + @ApiModelProperty(name = "淇濆吇缁撴灉",notes = "") private String maintenanceResult; - /**鎶ヤ慨鏍囪*/ - @Excel(name = "鎶ヤ慨鏍囪", width = 15) - @ApiModelProperty(value = "鎶ヤ慨鏍囪") + /** 鎶ヤ慨鏍囪 */ + @ApiModelProperty(name = "鎶ヤ慨鏍囪",notes = "") private String reportFlag; - /**寮傚父鎻忚堪*/ - @Excel(name = "寮傚父鎻忚堪", width = 15) - @ApiModelProperty(value = "寮傚父鎻忚堪") + /** 寮傚父鎻忚堪 */ + @ApiModelProperty(name = "寮傚父鎻忚堪",notes = "") private String exceptionDescription; } -- Gitblit v1.9.3