forked from gzzfw/backEnd/gz-dyh
parent: 592c8a | patch | commitdiff
liyj
2024-10-14 94dae325bbe4e23d1a5ebc08788b7d5a7e39a029
refs
author liyj <15602261488@163.com>
Monday, October 14, 2024 18:03 +0800
committer liyj <15602261488@163.com>
Monday, October 14, 2024 18:03 +0800
commit94dae325bbe4e23d1a5ebc08788b7d5a7e39a029
tree f1ec4c87e04da1c71c54f9ab46259b96d695913d tree | zip | gz
parent 592c8a2dcc33fd6eb32dbcfbaed4a16aab31d28d view | diff
1be40c8a6695dfe8623687604d7a90a9eb7ccd70 view | diff 
Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

# Conflicts:
#	dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
4 files renamed
11 files modified
323 ■■■■■ changed files
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridRoleMenuDTO.java 5 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/dto/GridUserRoleDTO.java 4 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridRoleMenuVo.java 2 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridUserRoleVo.java 2 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/SysClient.java 15 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java 66 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUnitMapper.java 2 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml 8 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java 173 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java 9 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java 12 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridSysRoleDTO.java 2 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuRequestVo.java 1 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleRequestVo.java 1 ●●●●● diff | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java 21 ●●●●● diff | view | raw | blame | history