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

didiyu

2018-12-10 6382c2a4220ff5774dba39848c2faabf0f7002f1

 gx_tieta/WebRoot/control.jsp

@@ -1026,7 +1026,7 @@
                  </tr>

                  <tr>

                     <th>单体数据来源类型</th>

                     <th>停电升压榨干电池数量（1~2）</th>

                     <th>停电升压榨干电池数量（0~2）</th>

                  </tr>

                  <tr>

                     <td>

@@ -1046,7 +1046,7 @@
                     <td><input type="text" id="sysSet_startLimit" value=""></td>

                  </tr>

                  <tr>

                     <th>电池合路器主电池组编号（1~2）</th>

                     <th>电池合路器主电池组编号（0~2）</th>

                     <th>背光时长（0~999分钟）</th>

                  </tr>

                  <tr>