Merge branch 'master' of D:\xampp\htdocs\mti-ais with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
增加： cpa功能
获取adoyo提交的版本