路网指数查询sql修改，应急队伍关联查询修改

src/main/resources/mapper/emergency/EmergencyTeamMapper.xml

@@ -196,7 +196,7 @@
         e.number as e_number,
         e.manager as e_manager,
         e.telephone as e_telephone,
-        e.bz as e_bz,
+        e.bz as e_bz
     </sql>
 
     <sql id="emergencyCarFields">
@@ -212,7 +212,7 @@
         c.car_number as c_car_number,
         c.driver as c_driver,
         c.telephone as c_telephone,
-        c.bz as c_bz
+        c.bz as c_bz,
     </sql>
 
     <select id="getEmergencyMaterialAndEquipmentVo" resultMap="emergencyMaterialAndEquipmentVoMap">
@@ -220,8 +220,8 @@
         <include refid="emergencyTeamFields"/>
         <include refid="materialHouseFields"/>
         <include refid="emergencyMaterialFields"/>
-        <include refid="emergencyEquipmentFields"/>
         <include refid="emergencyCarFields"/>
+        <include refid="emergencyEquipmentFields"/>
         FROM emergency_team t
         LEFT JOIN material_house h on t.row_id = h.team_id
         LEFT JOIN emergency_material m on t.row_id = m.team_id

src/main/resources/mapper/zhjc/ZhjcPtgsdLwzsMapper.xml

@@ -16,7 +16,7 @@
         cs.luxianmingcheng as lxmc,
         cs.pingjunxingshisudu as pjss,
         cs.guancelicheng as gclc,
-        cs.nian as `year`,
+        cs.nian as year,
         jtl.jiaotongyongjidu as yjd,
         jtl.shiyingjiaotongliang as syjtl
         FROM
@@ -39,7 +39,7 @@
         cs.luxianmingcheng as lxmc,
         cs.pingjunxingshisudu as pjss,
         cs.guancelicheng as gclc,
-        cs.nian as `year`,
+        cs.nian as year,
         jtl.jiaotongyongjidu as yjd,
         jtl.shiyingjiaotongliang as syjtl
         FROM