Merge remote-tracking branch 'origin/master'

tangzy

2022-07-16 dbbdbab62839ce6ba271d2144e37ab6b05f42c78

 src/main/java/org/springblade/modules/traceability/mapper/SweepRecordMapper.xml

@@ -170,6 +170,7 @@
      and sl.farm_id = #{sweepRecord.farmId}
        GROUP BY gptime
        ) AS righttable ON DATE_FORMAT(lefttable.date, '%Y-%c-%d') = righttable.gptime
        ORDER BY time
    </select>

    <!--获取扫描次数统计数据（年统计）-->