Merge branch '0601Action' into test

src/views/couponManager/index.vue

@@ -273,7 +273,7 @@
           <el-table-column
             align="center"
             prop="warningStockNum"
-            label="领取值"
+            label="领取数量"
           >
             <template slot-scope="scope">
               <div>
@@ -284,7 +284,7 @@
           <el-table-column
             align="center"
             prop="warningStockNum"
-            label="预警值"
+            label="库存预警值"
           ></el-table-column>
           <el-table-column align="center" prop="status" label="状态">
             <template slot-scope="scope">