
# Conflicts: # fastbee-common/src/main/java/com/fastbee/common/utils/DateUtils.java # fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/TableMapper.java # fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java