转台操作还未测试，账务卧单库需要插入数据
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev

Conflicts:
	src/com/bawei/lesheng/activity/front/MoveTableActivity.java
	src/com/bawei/lesheng/bl/Ts_ftkDAO.java