合并代码，解决代码冲突

ludc

2023-06-05 9474fadca23df051af1789b2078aca9c3163a017

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/AttributeWrapper.java

@@ -79,4 +79,5 @@
      attribute.setTs(now);
      return attribute;
   }

}