Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

common/common-entity/src/main/java/com/yihu/jw/entity/iot/equipment/IotEquipmentDetailDO.java

@@ -74,13 +74,6 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
     */
    private String latitude;
    public String getBelongAreCode() {
        return belongAreCode;
    }
    public void setBelongAreCode(String belongAreCode) {
        this.belongAreCode = belongAreCode;
    }
    public String getLongitude() {
        return longitude;
@@ -201,4 +194,13 @@ public class IotEquipmentDetailDO extends UuidIdentityEntityWithOperator {
    public void setBelongAre(String belongAre) {
        this.belongAre = belongAre;
    }
    public String getBelongAreCode() {
        return belongAreCode;
    }
    public void setBelongAreCode(String belongAreCode) {
        this.belongAreCode = belongAreCode;
    }
}