Merge remote-tracking branch 'origin/master'

zss

2023-08-15 d9e5ab959b7ff2c578672938c205a7a82765ef9f

 standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java

@@ -16,5 +16,7 @@
 */
public interface DeviceMapper extends BaseMapper<Device> {

    List<Map<String, Object>> deviceTwoTree(Integer type);
    List<Map<String, Object>> deviceTwoTree(Integer type, String search_class);

    List<Map<String, Object>> DevicePageList(String codeNameModel, Integer type, Integer deviceStatue, Integer deviceId, String fatherName);
}