~chenjialiang/moral.git

陈家良 / moral

forked from moral

summary
commits
tree
docs
forks
compare

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

cjl

2023-08-30 6dc7dc3670300ec7949f8134ab80166107b2f705

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

@@ -7,6 +7,7 @@
        <id column="id" property="id"/>
        <result column="name" property="name"/>
        <result column="mac" property="mac"/>
        <result column="guid" property="guid"/>
        <result column="operate_ids" property="operateIds"/>
        <result column="organization_id" property="organizationId"/>
        <result column="device_version_id" property="deviceVersionId"/>

			@@ -7,6 +7,7 @@
			<id column="id" property="id"/>
			<result column="name" property="name"/>
			<result column="mac" property="mac"/>
			<result column="guid" property="guid"/>
			<result column="operate_ids" property="operateIds"/>
			<result column="organization_id" property="organizationId"/>
			<result column="device_version_id" property="deviceVersionId"/>