Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml

@@ -28,7 +28,7 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
-            and hygf_jp_inverter.`state` is not null and hygf_jp_inverter.`state` in ("在线","告警","离线")
+            and hygf_jp_inverter.`state` is not null and hygf_jp_inverter.`state` in ("在线","报警","离线")
         </where>
         GROUP BY hygf_jp_inverter.`state`
     </select>