From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardPlanningMaterial.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardPlanningMaterial.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardPlanningMaterial.java index 9546894..6162ed0 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardPlanningMaterial.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandardPlanningMaterial.java @@ -34,8 +34,8 @@ private static final long serialVersionUID = 1L; /**淇濆吇鏍囧噯id*/ - @Excel(name = "淇濆吇鏍囧噯id", width = 15) - @ApiModelProperty(value = "淇濆吇鏍囧噯id") + @Excel(name = "淇濆吇鏍囧噯id/涓氬姟琛ㄤ富閿甀D", width = 15) + @ApiModelProperty(value = "淇濆吇鏍囧噯id/涓氬姟琛ㄤ富閿甀D") private String maintenanceStandardId; /**鐗╂枡id*/ @Excel(name = "鐗╂枡id", width = 15) -- Gitblit v1.9.3