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/service/course/CourseService.java

@@ -673,9 +673,9 @@ public class CourseService {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String nowDate = sdf.format(new Date());
        if (mapList.size() > 0){
            object.put("recruitId",mapList.get(0).get("recruitId"));//机构id
            object.put("recruitId",mapList.get(0).get("recruitId"));//招生id
            object.put("id",mapList.get(0).get("id"));//机构id
            object.put("code",mapList.get(0).get("code"));//机构id
            object.put("code",mapList.get(0).get("code"));//机构code
            object.put("name",mapList.get(0).get("name"));//机构名称
            object.put("mobile",mapList.get(0).get("mobile"));//机构联系方式
            object.put("photo",mapList.get(0).get("photo"));//机构图片
@@ -745,6 +745,7 @@ public class CourseService {
                    "WHERE o.id = '"+id+"' ";
            mapList = jdbcTemplate.queryForList(sql1);
            object.put("id",mapList.get(0).get("id"));//机构id
            object.put("code",mapList.get(0).get("code"));//机构code
            object.put("name",mapList.get(0).get("name"));//机构名称
            object.put("mobile",mapList.get(0).get("mobile"));//机构联系方式
            object.put("photo",mapList.get(0).get("photo"));//机构图片