Merge remote-tracking branch 'origin/master'

aircraft-system/src/main/java/com/aircraft/modules/security/service/BUserDetailsService.java

@@ -45,7 +45,7 @@ public class BUserDetailsService implements UserDetailsService {
                 userDto.setEnabled(true);
                 userDto.setIsAdmin(false);
                 // 创建一个 JwtCustomerDto 对象
-                customerDto = new JwtUserDto(userDto, UserTypeEnum.CUSTOMER, new ArrayList<>(), customerDto.getCustomerType());
+                customerDto = new JwtUserDto(userDto, UserTypeEnum.CUSTOMER, new ArrayList<>(), customer.getCustomerType());
                 // 添加缓存数据
                 userCacheManager.addCustomerCache(username, customerDto);
             }