Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

 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;



@@ -104,4 +106,7 @@


    private Long townCode;

    private Long villageCode;

    
    @Transient

    private List<Device> devices;

}