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/patient/consult/ConsultController.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -1289,7 +1289,7 @@ public class ConsultTeamService extends ConsultService {
    }
    /**
     * 医生关闭三师咨询
     * 医生关闭三师咨询(续方咨询)
     *
     * @param consult 三师咨询标识
     * @return