update sub
add
...
Merge branch 'master' of https://github.com/LuckyStars/nbc

Conflicts:
	sm2/src/resource/clientconfig.properties
	sm2/src/resource/jdbc.properties