smartlab_promote.git

智慧实验室优化版本

Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 f3b14ef7006c2c03e1dbef18504088f119ec5782

refs
author	李宇 <986321569@qq.com>
	Friday, June 25, 2021 18:11 +0800
committer	李宇 <986321569@qq.com>
	Friday, June 25, 2021 18:11 +0800
commit	f3b14ef7006c2c03e1dbef18504088f119ec5782
tree	5cdfd857c6af63ab5a33c8233bcc4ce25ab73193 tree \| zip \| gz
parent	b48666e1f30b3334726d218d6b05d1228a307fd7 view \| diff 178788d231d7d891c1874635b8e11dd951fc4230 view \| diff

Merge remote-tracking branch 'origin/master'

23 files modified

	src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java	90 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/ApprovalMngController.java	23 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/ContainerStatusMngController.java	23 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java	45 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/OrderMngController.java	23 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/RequireMngController.java	21 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java	68 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.java	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml	39 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml	7 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.xml	22 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml	32 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeApplyService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysContainerSensorsService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysContainerSensorsServiceImpl.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysReagentService.java	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java	10 ●●●●● diff \| view \| raw \| blame \| history