Merge branch 'dev-compliance-0708' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme into dev-compliance-0708

* 'dev-compliance-0708' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme:
  提交兑换ui

# Conflicts:
#	src/views/merge-detail.vue