Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-29 c363f330655a2e7d5dfe54a767e10d8c86ea96a6

 gx_tieta/WebRoot/equipWarn1.jsp

@@ -124,6 +124,8 @@
                                   <option value="119026">基站掉站告警</option>

                                   <option value="119027">基站开门告警</option>

                                   <option value ="119028">设备高温告警</option>

                                   <option value ="119032">设备SD卡故障</option>

                                   <option value ="119033">采集线告警</option>

                                   

                                </select>

                            </td>