智慧农业后台管理
parent: faebe3 | patch | commitdiff
tangzy
2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d
refs
author tangzy <tangzy123456>
Monday, July 18, 2022 15:16 +0800
committer tangzy <tangzy123456>
Monday, July 18, 2022 15:16 +0800
commit6d7633051dc592f80b7967e34fa6e34f340f899d
tree 796b0243c0104796b5e4d221fe6135f98f4bdf7a tree | zip | gz
parent faebe32c53e360a854d33a919ea612fea6b65a3e view | diff
981a3d85848753a799da2d909089c2fe4fcd3ccf view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
11 files modified
67 ■■■■■ changed files
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml 8 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/farmplant/vo/FarmProductStockVO.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml 5 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 8 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IUserService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/system/vo/UserVO.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java 10 ●●●●● diff | view | raw | blame | history