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

server/svr-configuration/src/main/resources/application.yml

@@ -19,7 +19,8 @@ eureka:
#      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
#      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka
#      defaultZone: http://jw:jkzl@172.16.100.63:8761/eureka  # 心脏中心外网
      defaultZone: http://jw:jkzl@192.168.120.210:8761/eureka  # 心脏中心外网
#      defaultZone: http://jw:jkzl@192.168.120.210:8761/eureka  # 心脏中心外网
      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka  # 眼科医院
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictDoctorDutyService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictDoctorDutyDao;
import com.yihu.jw.dict.dao.DictDoctorDutyDao;
import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;