Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

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

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

    @Transient

    private DeviceProperty deviceProperty;



   @Transient

   private Boolean hasWindInfo;

}