modified:   main/java/com/flyhz/framework/util/RandomString.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz