Merge remote-tracking branch 'origin/master'

zhangherong

昨天 efaf016bd38b2e30d3942890beacc2b50bae70d9

 src/views/cms/CuttingInventoryList.vue

@@ -123,7 +123,7 @@
          <span slot="inventoryStatus" slot-scope="text">
            <a-tag :color="getTagColor(text)">{{ text }}</a-tag>
          </span>
        </a-table>
        />
      </a-card>
    </div>