moral.git - Gitblit

kaiyu

2021-09-01 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7

refs
author	kaiyu <404897439@qq.com>
	Wednesday, September 1, 2021 11:02 +0800
committer	kaiyu <404897439@qq.com>
	Wednesday, September 1, 2021 11:02 +0800
commit	55bddeb7f2bb55498e9ac179b3c9d513d558b7c7
tree	07180f46a2287a7f7e6a59828417d0c6f771ac95 tree \| zip \| gz
parent	2d1ade42470c5c3650034e863a5a2612ca2540db view \| diff 1a529c3f8a623eb3e10ff6c7dcb99e79bbd451f0 view \| diff

Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

6 files added

2 files modified

	screen-api/src/main/java/com/moral/api/controller/OrganizationLayoutController.java	40 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/entity/OrganizationLayout.java	74 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/mapper/OrganizationLayoutMapper.java	16 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/OrganizationLayoutService.java	29 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/OrganizationLayoutServiceImpl.java	108 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/OrganizationLayoutMapper.xml	17 ●●●●● diff \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java	1 ●●●●● diff \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java	5 ●●●●● diff \| view \| raw \| blame \| history