moral.git - Gitblit

cjl

2023-09-27 3bbf11c99f594a2757f601fa3c680917cea33c17

refs
author	cjl <276999030@qq.com>
	Wednesday, September 27, 2023 11:09 +0800
committer	cjl <276999030@qq.com>
	Wednesday, September 27, 2023 11:09 +0800
commit	3bbf11c99f594a2757f601fa3c680917cea33c17
tree	3f758aeb4d074ad11f30d09b6ed039585570590a tree \| zip \| gz
parent	bd8b3f8e4b5d8af99f267eb5c6efaac03406c620 view \| diff b8fe4c7b5f4f03dcfadff95702a07040ab9a1b57 view \| diff

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

1 files added

9 files modified

	screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java	15 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java	4 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/pojo/query/allocationextension/AllocationExtensionPageCond.java	4 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/AllocationService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java	4 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java	22 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/AllocationMapper.xml	7 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml	42 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/resources/mapper/UserMapper.xml	2 ●●●●● diff \| view \| raw \| blame \| history