曹鹏飞 4dc5382f9c Merge remote-tracking branch '惠信/develop' into develop ... # Conflicts: # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRoleButtonMap.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminRoleMenuMap.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUserRoleMap.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseCustomer.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminRoleButtonMapMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminRoleMenuMapMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/AdminUserRoleMapMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseCustomerMapper.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminRoleButtonMapService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminRoleMenuMapService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminUserRoleMapService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleButtonMapServiceImpl.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminRoleMenuMapServiceImpl.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserRoleMapServiceImpl.java # nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java # nflg-mobilebroken-repository/src/main/resources/mapper/TBaseCustomerMapper.xml		2025-01-27 16:10:02 +08:00
..
java/com/nflg/mobilebroken/admin	Merge remote-tracking branch '惠信/develop' into develop	2025-01-27 16:10:02 +08:00
resources	feat: 使管理端服务能运行；数据库访问添加对字典、字典值、字典值翻译的支持	2025-01-20 10:00:46 +08:00