smartlab_promote.git

智慧实验室优化版本

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

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

refs
author	gdg <764716047@qq.com>
	Monday, February 1, 2021 10:19 +0800
committer	gdg <764716047@qq.com>
	Monday, February 1, 2021 10:19 +0800
commit	1cbac7aa20a183a9a893651bf0cef24b1909eb5c
tree	1820206533e06e0cb732e4874c4018608b6fd9dd tree \| zip \| gz
parent	8beaf701a900ddd5a0a482f425080635ff55166d view \| diff e3f9c9350c14707277b4fbf03a4d78c75ec04174 view \| diff

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

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

19 files modified

	src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java	13 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java	47 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml	20 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml	27 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml	13 ●●●●● 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/OpeApplyService.java	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java	10 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java	28 ●●●●● 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	9 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java	1 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/approval_mng.xhtml	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/personal_use_info.xhtml	13 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_reagent_use.xhtml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_reagent_use_person.xhtml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_stock_mng.xhtml	19 ●●●●● diff \| view \| raw \| blame \| history