Merge remote-tracking branch 'origin/master'

src/views/basic/busType/bussinessType.vue

@@ -376,6 +376,7 @@ export default {
         if (this.inputQuery.sortNum < 0) {
           this.$message.error("排序不能小于0！");
           return;
+
         } else if (this.inputQuery.sortNum > 999) {
           this.$message.error("排序不能大于999！");
           return;

src/views/basic/product/productEdit.vue

@@ -164,7 +164,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="预警时间单位:">
-              <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>
+              <el-select v-model="editQuery.isDateBy" style="width: 80%" placeholder="状态" clearable>
                 <el-option label="天" :value="1"></el-option>
                 <el-option label="小时" :value="2"></el-option>
               </el-select>