Commit 5d4f18109eb2133268de76881811f9ff3ceccf95
Exists in
master
Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/center
# Conflicts: # parent/hospital.web/src/main/java/com/lyms/hospital/controller/LoginController.java # parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 20 changed files
- design-doc/design/db/院内设计.PDM
- parent/base.common/pom.xml
- parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java
- parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml
- parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml
- parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java
- parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java
- parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java
- parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskSourceService.java
- parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java
- parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java
- parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java
- parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java
- parent/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
- parent/hospital.web/src/main/resources/app-context.xml
- parent/hospital.web/src/main/resources/xml/app-datasource.xml
- parent/hospital.web/src/test/java/test/hospital/BaseServiceTest.java
- parent/hospital.web/src/test/java/test/hospital/BaseTest.java
- parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java
- parent/hospital.web/src/test/java/test/hospital/service/package-info.java