From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码,解决代码冲突

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/ModifyAttributeWrapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/ModifyAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/ModifyAttributeWrapper.java
index b024482..955a58d 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/ModifyAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/ModifyAttributeWrapper.java
@@ -32,7 +32,7 @@
 			data.setOid(VciBaseUtil.getPk());
 			data.setCreateTime(new Date());
 			data.setCreator(AuthUtil.getUserAccount());
-			data.setBtmname("modifyAttributeInfo");
+			data.setBtmName("modifyAttributeInfo");
 			data.setHandleDate(new Date());
 			data.setHandleFinishFlag(BooleanEnum.TRUE.getValue());
 			data.setHandleUserName(AuthUtil.getUserAccount());

--
Gitblit v1.10.0