Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/create-good.vue

@@ -301,19 +301,19 @@
 
             <el-form-item label="有效期" prop="expiredTime">
               <el-col :span="13">
-               <!-- <el-input
+               <el-input
                     size="small"
                     v-model="formData.expiredTime"
                     placeholder="请输入有效期"
                     style="width:70%;"
-                ></el-input> -->
-                <el-date-picker
+                ></el-input>
+               <!-- <el-date-picker
                   v-model="formData.expiredTime"
                   size="small"
                   format="yyyy-MM-dd HH:mm:ss"
                   type="date"
                   placeholder="选择日期">
-                </el-date-picker>
+                </el-date-picker> -->
 
                 <span class="word-num"></span>
               </el-col>