smartlab_promote.git

智慧实验室优化版本

gdg

2021-01-26 f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4

refs
author	gdg <764716047@qq.com>
	Tuesday, January 26, 2021 18:12 +0800
committer	gdg <764716047@qq.com>
	Tuesday, January 26, 2021 18:12 +0800
commit	f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4
tree	8512100a60bea0575873ebf2165411c3fc09d7d4 tree \| zip \| gz
parent	78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 view \| diff 2de091af749c000cad15288a72938fd57e25d262 view \| diff

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

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

11 files modified

	src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java	56 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml	24 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml	23 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/entity/OpeApply.java	21 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java	9 ●●●●● 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	69 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_reagent_use.xhtml	37 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_reagent_use_person.xhtml	42 ●●●●● diff \| view \| raw \| blame \| history