Merge branch 'master' of http://114.215.101.231:8099/wangzhi/kcd

@@ -331,7 +331,7 @@ class Common extends Api
         } else {
             foreach ($BatteryArr as $k => $v) {
                 $Battery[$k]['id'] = $v['id'];
-                $Battery[$k]['title'] = $v['title'];
+                $Battery[$k]['title'] = $v['BatteryCode'];
             }
         }
 //        $HoursArr = Db::name('hours')->select();