Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

project/fengdu/app/AppIntegratingSupermarket/components/addGoods.vue

@@ -18,7 +18,7 @@
                 :selectList="dict.getDict('integralSGType')">
               </ai-select>
             </el-form-item>
-            <el-form-item  style="width: 100%" label="商品类型说明" prop="typeExplain"">
+            <el-form-item  style="width: 100%" label="商品类型说明" prop="typeExplain">
               <el-input type="input" size="small" v-model="form.typeExplain" clearable placeholder="请输入商品类型说明" maxlength="50" show-word-limit></el-input>
             </el-form-item>
             <el-form-item style="width: 100%" label="商品图片" prop="picUrl" :rules="[{required: true, message: '请选择商品图片', trigger: 'change'}]">