Home Explore Help
Register Sign In
trick9191
/
wlyy2.0
forked from Amoy2/wlyy2.0
Watch 1
Star 0
Fork 0
Files
Browse Source

Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManagerController.java
wangzhinan 6 years ago
parent
b2cd327f6b
commit
0309b2a7d8
1 changed files with 0 additions and 10 deletions
Unified View Show Diff Stats
  1. 0 10
      patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/JMController.java

+ 0 - 10
patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/JMController.java
View File 

@ -1,11 +1,7 @@
 
package com.yihu.wlyy.service.controller;
 
package com.yihu.wlyy.service.controller;
 
import com.google.gson.JsonObject;
 
import com.yihu.wlyy.service.common.model.Result;
 
import com.yihu.wlyy.service.common.model.Result;
 
import com.yihu.wlyy.service.entity.PatientReservation;
 
import com.yihu.wlyy.service.service.JMService;
 
import com.yihu.wlyy.service.service.JMService;
 
import com.yihu.wlyy.service.service.guahao.GuahaoDoctor;
 
import com.yihu.wlyy.service.service.guahao.GuahaoService;
 
import io.swagger.annotations.Api;
 
import io.swagger.annotations.Api;
 
import io.swagger.annotations.ApiOperation;
 
import io.swagger.annotations.ApiOperation;
 
import io.swagger.annotations.ApiParam;
 
import io.swagger.annotations.ApiParam;
 
@ -17,12 +13,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
import org.springframework.web.bind.annotation.RequestParam;
 
import org.springframework.web.bind.annotation.RequestParam;
 
import org.springframework.web.bind.annotation.ResponseBody;
 
import org.springframework.web.bind.annotation.ResponseBody;
 
import java.text.SimpleDateFormat;
 
import java.util.Calendar;
 
import java.util.Date;
 
import java.util.List;
 
import java.util.Map;
 
/**
 
/**
 
 * 计划免疫接口
 
 * 计划免疫接口