Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

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

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

    @Transient

    private DeviceProperty deviceProperty;



   @Transient

   private Boolean hasWindInfo;

}