sync
Merge branch 'master' of https://github.com/liqites/warehouse
Merge branch 'release-v1.2'
Merge branch 'release-v1.2'
update win client
update win client
Merge branch 'release-v1.4'
update template
fix
Merge branch 'release-v1.4'
.tff
Merge branch 'master' of github.com:liqites/warehouse
add printer api
Merge branch 'release-v1.5'
update print service
Merge branch 'master' of github.com:liqites/warehouse
Merge branch 'release-v1.5'
fix server set bug
Merge branch 'master' of github.com:liqites/warehouse
fix