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

ChenJiaHe

2021-01-21 4e0b09cbd4808024ba0b1d2d56b6f411be3c9097

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

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

      }
      return null;
   }