Merge branch '0601Action' into test

src/views/couponManager/couponUpdate.vue

@@ -191,7 +191,7 @@
         </el-col>
         <el-col style="width: 395px">
           <el-form-item
-            label="预警值"
+            label="预警值(-1为不限制)"
             prop="warningStockNum"
             :rules="[{ required: true, message: '请输入预警值' }]"
           >

src/views/couponManager/index.vue

@@ -285,7 +285,15 @@
             align="center"
             prop="warningStockNum"
             label="库存预警值"
-          ></el-table-column>
+          >
+              <template slot-scope="scope">
+              <div>
+                {{
+                  scope.row.warningStockNum == -1 ? "不限制" : scope.row.stockCount
+                }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="status" label="状态">
             <template slot-scope="scope">
               <div>