Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-10 ef431a71ed043e8fb63777793df23c110b853803

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

@@ -113,5 +113,6 @@
   private MonitorPoint monitorPoint;

   @Transient

   private List<Integer> organizationIds;



    @Transient

    private Profession profession;

}