From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001 From: zenglf <18502938215@163.com> Date: 星期四, 28 九月 2023 14:39:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java index 600fc4f..e661818 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDriveTypeParamConfig.java @@ -50,13 +50,13 @@ /** * 灞曠ず鏍囧織 */ - @Excel(name = "灞曠ず鏍囧織", width = 15) + @Excel(name = "灞曠ず鏍囧織", width = 15, replace = {"鏄痏Y", "鍚N"}) @ApiModelProperty(value = "灞曠ず鏍囧織") private String showFlag; /** * 宸ヤ綔鏇茬嚎鐢熸垚鏍囪 */ - @Excel(name = "宸ヤ綔鏇茬嚎鐢熸垚鏍囪", width = 15) + @Excel(name = "宸ヤ綔鏇茬嚎鐢熸垚鏍囪", width = 15, replace = {"鏄痏Y", "鍚N"}) @ApiModelProperty(value = "宸ヤ綔鏇茬嚎鐢熸垚鏍囪") private String curveGenerationFlags; -- Gitblit v1.9.3