Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

 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;