合并冲突，可忽略此次提交
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev

Conflicts:
	src/com/bawei/lesheng/bl/Ts_ftkDAO.java