~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

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

cjl

2023-07-21 1393ec7b94738419acbfd340cf24d3debaa2b73e

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

@@ -25,6 +25,7 @@
        <result column="install_time" property="installTime"/>
        <result column="is_delete" property="isDelete"/>
        <result column="extend" property="extend"/>
        <result column="town_code" property="townCode"/>
    </resultMap>

    <!--监测因子趋势图数据-->

			@@ -25,6 +25,7 @@
			<result column="install_time" property="installTime"/>
			<result column="is_delete" property="isDelete"/>
			<result column="extend" property="extend"/>
			<result column="town_code" property="townCode"/>
			</resultMap>

			<!--监测因子趋势图数据-->