Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-17 66ff6f509bbbba04cffc428e7e1c886b534b4f13

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

@@ -36,6 +36,10 @@

    Integer deviceDelete(Integer deviceId);

    Integer deviceDeleteIdOrFather(Integer id, String deviceFather);

    List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup);

    Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather);

    List<Map<String, Object>> selectDeviceIdAndName();