Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorService.java

@@ -300,7 +300,18 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
    }
//    public static void main(String ag[]){
//        String str = "[{\"doctor\",\"1\"},{\"doctor\",\"2\"}]";
//        String str = "[ " +
//                "{ " +
//                "\"title\":\"Java 开发\", " +
//                "\"edition\":3, " +
//                "\"author\":[\"smith\",\"张三\",\"李四\"] " +
//                "}, " +
//                "{ " +
//                "\"title\":\"Web 开发\", " +
//                "\"edition\":3, " +
//                "\"author\":[\"Allen\",\"王五\",\"赵六\"] " +
//                "} " +
//                "]";
//        JSONArray json = JSONArray.fromObject(str);
//        for(int i=0;i<json.size();i++){
//            JSONObject doctor = json.getJSONObject(i);