Merge remote-tracking branch 'origin/master'

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
+    <packaging>jar</packaging>
     <groupId>com.tianbo</groupId>
     <artifactId>util</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -48,6 +48,8 @@
             <artifactId>amqp-client</artifactId>
             <version>5.7.0</version>
         </dependency>
+
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

@@ -34,7 +34,7 @@ public class Bean2Map {
    * @param clazz 实体对象类型
    * @return
    */
-          public static Object map2Object(Map<String, Object> map, Class<?> clazz) {
+  public static Object map2Object(Map<String, Object> map, Class<?> clazz) {
     if (map == null) {
       return null;
     }

@@ -15,4 +15,16 @@ public class AwbaUtils {
         }
         return awba;
     }
+
+    public static String awbh(String awbh){
+
+        if (!"".equals(awbh) && null != awbh){
+            return awbh;
+        }else {
+            awbh = "";
+            return awbh;
+        }
+
+    }
+
 }