Merge branch 'master-stander' into master-jiayan

cmg

2024-06-22 cb38789006b411b29fba27a6a60493dc78946e17

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

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

      }
      return null;
   }