Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6cad53d387
|
|
@ -303,10 +303,10 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl<KitchenDeviceInfoM
|
|||
vo.setDeviceTypeName(DeviceTypeEnum.SAMPLECABINET.getValue());
|
||||
list.add(vo);
|
||||
|
||||
vo=new KitchenDeviceListVO();
|
||||
vo.setDeviceType(DeviceTypeEnum.TEMPERATURE_HUMIDITY_SENSOR.getKey());
|
||||
vo.setDeviceTypeName(DeviceTypeEnum.TEMPERATURE_HUMIDITY_SENSOR.getValue());
|
||||
list.add(vo);
|
||||
// vo=new KitchenDeviceListVO();
|
||||
// vo.setDeviceType(DeviceTypeEnum.TEMPERATURE_HUMIDITY_SENSOR.getKey());
|
||||
// vo.setDeviceTypeName(DeviceTypeEnum.TEMPERATURE_HUMIDITY_SENSOR.getValue());
|
||||
// list.add(vo);
|
||||
|
||||
vo=new KitchenDeviceListVO();
|
||||
vo.setDeviceType(DeviceTypeEnum.WATER_METER.getKey());
|
||||
|
|
@ -343,15 +343,15 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl<KitchenDeviceInfoM
|
|||
vo.setDeviceTypeName(DeviceTypeEnum.HEALTH_IN_ONE.getValue());
|
||||
list.add(vo);
|
||||
|
||||
vo=new KitchenDeviceListVO();
|
||||
vo.setDeviceType(DeviceTypeEnum.TICKET_PRINTER.getKey());
|
||||
vo.setDeviceTypeName(DeviceTypeEnum.TICKET_PRINTER.getValue());
|
||||
list.add(vo);
|
||||
// vo=new KitchenDeviceListVO();
|
||||
// vo.setDeviceType(DeviceTypeEnum.TICKET_PRINTER.getKey());
|
||||
// vo.setDeviceTypeName(DeviceTypeEnum.TICKET_PRINTER.getValue());
|
||||
// list.add(vo);
|
||||
|
||||
vo=new KitchenDeviceListVO();
|
||||
vo.setDeviceType(DeviceTypeEnum.AI_MACHINE.getKey());
|
||||
vo.setDeviceTypeName(DeviceTypeEnum.AI_MACHINE.getValue());
|
||||
list.add(vo);
|
||||
// vo=new KitchenDeviceListVO();
|
||||
// vo.setDeviceType(DeviceTypeEnum.AI_MACHINE.getKey());
|
||||
// vo.setDeviceTypeName(DeviceTypeEnum.AI_MACHINE.getValue());
|
||||
// list.add(vo);
|
||||
|
||||
return list;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue