smartlab_promote.git

智慧实验室优化版本

Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-01-29 31ffbaf322685984516cfb284fa58741debf4e96

refs
author	gdg <764716047@qq.com>
	Friday, January 29, 2021 09:12 +0800
committer	gdg <764716047@qq.com>
	Friday, January 29, 2021 09:12 +0800
commit	31ffbaf322685984516cfb284fa58741debf4e96
tree	99d92c1e6eb2b6c7ef069daceea7ceb5aa4ed473 tree \| zip \| gz
parent	f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 view \| diff d7427ab305dc17af447f5832903691eee329850c view \| diff

Merge remote-tracking branch 'remotes/origin/yufei' into master

# Conflicts:
#	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml

34 files modified

1 files added

	src/main/java/com/nanometer/smartlab/api/ApiAction.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java	21 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java	13 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java	14 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/OrderMngController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java	182 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/ProjectMngController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/UserMngController.java	22 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java	25 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.java	7 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml	111 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysLaboratoryContainerDao.xml	12 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml	11 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/entity/OpeUseFlow.java	48 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/entity/dto/PersonUseDetail.java	98 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java	13 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java	67 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerService.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java	10 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java	8 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java	27 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysUserService.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java	8 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/WEB-INF/config-mybatis.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/laboratory_container_mng.xhtml	8 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/laboratory_mng.xhtml	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/personal_use_info.xhtml	278 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/reagent_user_flow_info.xhtml	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/user_mng.xhtml	8 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_stock_mng.xhtml	5 ●●●●● diff \| view \| raw \| blame \| history