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

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientEndpoint.java

@@ -8,6 +8,7 @@ import com.yihu.jw.care.dao.label.WlyyPatientLabelDao;
import com.yihu.jw.care.service.patient.CarePatientService;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -37,6 +38,8 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
    private CarePatientService patientService;
    @Autowired
    private WlyyPatientLabelDao patientLabelDao;
    @Autowired
    private BasePatientDao patientDao;
    public int num = 20;
    @GetMapping(value = "testException")
@@ -131,6 +134,19 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "findByPateintId")
    @ApiOperation(value = "获取居民信息")
    public Envelop findByPateintId(
            @ApiParam(name = "id", value = "居民id")
            @RequestParam(value = "id", required = true) String id) {
        try{
            BasePatientDO patientDO = patientDao.findById(id);
            return success("获取成功",patientDO);
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @PostMapping(value = "updLatLon")
    @ApiOperation(value = "修改居民经纬度信息")
    public Envelop updLatLon(@ApiParam(name = "latLon", value = "经纬度24.48923061,118.10388605")