Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffInfoServiceImpl.java

@@ -75,7 +75,7 @@ public class KitchenStaffInfoServiceImpl implements IKitchenStaffInfoService {
                 KitchenDeviceListVO deviceInfo = kitchenDeviceInfoMapper.selectKitchenDeviceInfoByDeviceId(kitchenStaffDevicePrivilege.getDeviceId());
                 if(Objects.nonNull(deviceInfo)) {
                     accessAuthority.setDeviceName(deviceInfo.getDeviceName());
-                    accessAuthority.setLocation(deviceInfo.getSubPlace());
+                    accessAuthority.setLocation(deviceInfo.getSubPlaceName());
                 }
                 accessAuthority.setDeviceId(kitchenStaffDevicePrivilege.getDeviceId());
                 accessAuthority.setDeviceType(kitchenStaffDevicePrivilege.getDeviceType());