~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-28 bec26ab287b22ed9ba6eaa4da64d91a374fdc14d

 screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml

@@ -76,6 +76,6 @@
        FROM `history_second_cruiser`
        WHERE mac = #{mac}
          AND `time` <![CDATA[>=]]> #{startTime}
          AND `time` <![CDATA[<=]]> #{endTtime}
          AND `time` <![CDATA[<=]]> #{endTime}
    </select>
</mapper>

			@@ -76,6 +76,6 @@
			FROM `history_second_cruiser`
			WHERE mac = #{mac}
			AND `time` <![CDATA[>=]]> #{startTime}
			AND `time` <![CDATA[<=]]> #{endTtime}
			AND `time` <![CDATA[<=]]> #{endTime}
			</select>
			</mapper>