~admin/screen_job.git

admin / screen_job

forked from screen_job

summary
commits
tree
docs
forks
compare

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

kaiyu

2020-11-24 3152a4e4dadcd6ebfb8e882aa356d063416d49cc

 src/main/resources/mapper/AlarmMapper.xml

@@ -3,7 +3,6 @@
<mapper namespace="com.moral.mapper.AlarmMapper">
    <select id="getAlarmData" resultType="java.util.LinkedHashMap">
        SELECT
        mac,
        json_search ( json, 'all', '1' ) '1',
        json_search ( json, 'all', '2' ) '2',
        json_search ( json, 'all', '3' ) '3'

			@@ -3,7 +3,6 @@
			<mapper namespace="com.moral.mapper.AlarmMapper">
			<select id="getAlarmData" resultType="java.util.LinkedHashMap">
			SELECT
			mac,
			json_search ( json, 'all', '1' ) '1',
			json_search ( json, 'all', '2' ) '2',
			json_search ( json, 'all', '3' ) '3'