Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 ab497be6338bfdeaefbaebc60081ba18453da4ef

 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>