Merge branch 'develop' into release-v1.2
fix
fix
fix
fix bug
Merge branch 'develop' into release-v1.2
fix
add trans
Merge branch 'release-v1.2' of github.com:liqites/warehouse into release-v1.2
Merge branch 'release-v1.2' into develop