Merge branch 'test' into dev

src/main/java/com/sqx/modules/utils/AliPayOrderUtil.java

@@ -69,7 +69,10 @@ public class AliPayOrderUtil {
         // 4 代表长度为4
         // d 代表参数为正数型
         return machineId+String.format("%015d", hashCodeV);*/
-        return IdUtil.getSnowflake(1, 1).nextIdStr();
+//        return IdUtil.getSnowflake(1, 1).nextIdStr();
+
+        UUID uuid = UUID.randomUUID();
+        return uuid.toString().replace("-", "");
     }