Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -1,5 +1,7 @@
package com.moral.entity;



import java.util.List;



import javax.persistence.Id;

import javax.persistence.Transient;



@@ -102,6 +104,9 @@
    @Transient

    private Organization organization;



    private Integer town_code;

    private Integer village_code;

    private Long townCode;

    private Long villageCode;

    
    @Transient

    private List<Device> devices;

}