Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

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

@@ -16,6 +16,8 @@
 */
public interface HistorySecondCruiserMapper extends BaseMapper<HistorySecondCruiser> {

    List<Map<String,Object>> getCruiserData(Map<String,Object> params);

    List<String> getDates(Map<String,Object> params);

}