Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-04 b5a2fc07527ab700544f3b7ba0be01b2e015e2db

 screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java

@@ -1,5 +1,8 @@
package com.moral.api.mapper;

import java.util.List;
import java.util.Map;

import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

    /*监测因子趋势图数据*/
    List<Map<String, Object>> getTrendChartData(Map<String, Object> params);

}