Merge remote-tracking branch 'origin/master'

doum

昨天 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

 admin/src/components/business/OperaShopGoodsWindow.vue

@@ -180,8 +180,8 @@
      row.oldGoodsPrice = row.goodsPrice
    },
    blurEvent (row, curIndex, column) {
      if(this.price >= row.goodsPrice) {
        this.$tip.error('供货价不能低于销售价')
      if(this.price <= row.goodsPrice) {
        this.$tip.error('供货价不能大于销售价')
        row.isPriceSelected = !row.isPriceSelected
        row.goodsPrice = row.oldGoodsPrice// 价格还原
        return