Merge remote-tracking branch 'origin/master'

src/views/module_ems/tpmEquipment/modules/TpmEquipmentForm.vue

@@ -29,16 +29,8 @@
                 设备编号 
                 <a-tooltip title="若未填写设备编号 则自动生成">
                   <a-icon type="exclamation-circle" theme="filled" />
-                  <!-- <a-icon type="exclamation-circle" /> -->
-                  <!-- <a-icon type="question-circle-o" /> -->
                 </a-tooltip>
               </span>
-              <!-- <a-tooltip placement="top">
-                <template slot="title">
-                  <span>若未填写设备编号 则自动生成</span>
-                </template>
-                <a-button>Top</a-button>
-              </a-tooltip> -->
               <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
             </a-form-model-item>
           </a-col>