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

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

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

}