Commit 560ba8ee78882dc50f33b0fd6dd09fb5081adc78
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
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 53 changed files
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
- platform-data-api/src/main/java/com/lyms/platform/data/controller/BaseController.java
- platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java
- platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
- platform-data-api/src/main/resources/database.properties
- platform-data-api/src/main/resources/macro.vm
- platform-data-api/src/main/resources/spring/applicationContext-dal.xml
- platform-data-api/src/main/resources/spring/applicationContext-mvc.xml
- platform-data-api/src/main/resources/spring/applicationContext.xml
- platform-data-api/src/main/resources/spring/applicationContext_biz_patient.xml
- platform-data-api/src/main/resources/spring/spring-mongodb.xml
- platform-data-api/src/main/resources/velocity.properties
- platform-data-api/src/main/webapp/WEB-INF/vm/task/index.vm
- platform-data-api/src/main/webapp/WEB-INF/vm/task/test.vm
- platform-data-api/src/main/webapp/WEB-INF/web.xml
- platform-data-api/src/main/webapp/css/bootstrap-theme.min.css
- platform-data-api/src/main/webapp/css/bootstrap.min.css
- platform-data-api/src/main/webapp/scripts/jquery.min.js
- platform-data-api/src/main/webapp/scripts/layer/extend/layer.ext.js
- platform-data-api/src/main/webapp/scripts/layer/layer.js
- platform-data-api/src/main/webapp/scripts/layer/skin/default/icon-ext.png
- platform-data-api/src/main/webapp/scripts/layer/skin/default/icon.png
- platform-data-api/src/main/webapp/scripts/layer/skin/default/loading-0.gif
- platform-data-api/src/main/webapp/scripts/layer/skin/default/loading-1.gif
- platform-data-api/src/main/webapp/scripts/layer/skin/default/loading-2.gif
- platform-data-api/src/main/webapp/scripts/layer/skin/layer.css
- platform-data-api/src/main/webapp/scripts/layer/skin/layer.ext.css
- platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java
- platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/service/PlatService.java
- platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/service/impl/PlatServiceImpl.java
- platform-mommyData/src/main/resources/earlyOrm/Plat.xml
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
- platform-operate-api/src/main/webapp/WEB-INF/web.xml
- platform-resource/resources/config-dev.properties
- platform-resource/resources/config-product.properties
- platform-resource/resources/config-test.properties
- pom.xml