smartlab_promote.git

智慧实验室优化版本

gdg

2021-02-02 05f71eff9a356615db7629e8a439d451dfab60f7

refs
author	gdg <764716047@qq.com>
	Tuesday, February 2, 2021 08:47 +0800
committer	gdg <764716047@qq.com>
	Tuesday, February 2, 2021 08:47 +0800
commit	05f71eff9a356615db7629e8a439d451dfab60f7
tree	1e36adfaf88fed0260cb3f3efc8fd5e0bff165fe tree \| zip \| gz
parent	1cbac7aa20a183a9a893651bf0cef24b1909eb5c view \| diff 4c955cdf207b30cfad957b84c3546e0d37b81493 view \| diff

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

10 files modified

	src/main/java/com/nanometer/smartlab/controller/UserMngController.java	10 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysUserDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysUserService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java	5 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/login.xhtml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/personal_use_info.xhtml	8 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/resources/css/mybootstrap.css	14 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_reagent_use.xhtml	8 ●●●●● diff \| view \| raw \| blame \| history
	src/main/webapp/warehouse_reagent_use_person.xhtml	8 ●●●●● diff \| view \| raw \| blame \| history