From d1df2c7db4331a760303294cfdc5bae1d810867f Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 21 七月 2025 17:50:07 +0800 Subject: [PATCH] Merge branch 'master' into ywx --- src/main/java/com/chinaztt/mes/docx/dto/GetFileDto.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaztt/mes/docx/dto/GetFileDto.java b/src/main/java/com/chinaztt/mes/docx/dto/GetFileDto.java index 4e113ad..5d5ec59 100644 --- a/src/main/java/com/chinaztt/mes/docx/dto/GetFileDto.java +++ b/src/main/java/com/chinaztt/mes/docx/dto/GetFileDto.java @@ -22,8 +22,8 @@ private String fiberOpticRibbonCode; // 鍏夌氦甯︽暟鎹� private String fiberOpticRibbon; - //鏁版嵁搴撹繛鎺ヨ处鍙� - private String dbUser; - //鏁版嵁搴撹繛鎺ュ瘑鐮� + //鏁版嵁搴撶敤鎴峰悕 + private String dbUserName; + //鏁版嵁搴撳瘑鐮� private String dbPassword; } -- Gitblit v1.9.3