Commit fb633645 authored by zhiguo.liu's avatar zhiguo.liu

Merge remote-tracking branch 'origin/change_id_generator' into change_id_generator

# Conflicts:
#	commons-spring/src/main/java/cn/quantgroup/tech/util/IDGenerator.java
parents d408a7d9 df9b8c8a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment