Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

 src/main/java/com/moral/entity/ForecastWeather.java

@@ -9,7 +9,7 @@
@Data
public class ForecastWeather {
    @Id
    private Integer monitorPointId;
    private String cityCode;

    private Date time;