Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-11 7b09f233bde70508f6db7e08e983e9a2c4bb3e99

 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);
}