Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 088ceb9faf6f1d0d9f57bb9cd65f542337d40b7f

 base-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -33,17 +33,6 @@
     */
    List<Map<String, Object>> selectTreeDevice(Integer type, String father, Integer deviceStatus, String message);

    /**
     * 查询所有设备
     * @return
     */
    List<Device> selectDevice();

    /**
     * 根据设备id查询设备名称
     * @param id
     */
    String getDeviceNameById(Integer id);

    /**
     * 新增仪器设备
@@ -76,4 +65,10 @@
     * @param ids
     */
    void delAllDevice(String ids);

    /**
     * 原材料检验-->选择设备
     * @return
     */
    List<Map<String,Object>> chooseDevice();
}