Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

@@ -119,4 +119,7 @@
    private Profession profession;

    @Transient

    private DeviceProperty deviceProperty;



   @Transient

   private Boolean hasWindInfo;

}