add uniqueness check for merchant_num
Merge remote-tracking branch 'origin/master'

* origin/master:
  fix 积分对象bug
  fix 积分对象bug
  add_index: merchant_store merchant_num