Merge branch 'master' of https://gitee.com/huoxiong/hx_common

E1ED922C1E9526DD63272D7EC5C6CB77

2020-12-14 98118c2bf5343dde3dbf48c20bc8a0fd69cfedbd

 src/main/java/com/hx/util/AesUtil.java

@@ -97,7 +97,6 @@
         } catch (Exception e) {
            e.printStackTrace();
         }

      }
      return null;
   }