Signed-off-by: yangjun1985 <yj@yaozheng.com.cn>
Merge branch 'master' of https://github.com/sgewuhan/pm.git

Conflicts:
	com.tmt.kfzx/plugin.xml