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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

 screen-job/src/main/java/com/moral/api/mapper/HistoryDailyMapper.java

@@ -16,6 +16,6 @@
 */
public interface HistoryDailyMapper extends BaseMapper<HistoryDaily> {

    void insertHistoryDaily(List<HistoryDaily> list);
    void insertHistoryDaily(List<Map<String,Object>> list);

}