Skip to content

Y
yn-health-science
Switch branch/tag
History Find file
  • wangxl's avatar
    Merge remote-tracking branch 'origin/master' · 27045d6c
    wangxl authored 
    # Conflicts:
#	science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java
#	science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java
#	science-admin/src/main/java/com/yiboshi/science/service/ComProjectAuditService.java
#	science-admin/src/main/java/com/yiboshi/science/service/ComUnitService.java
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectAuditServiceImpl.java
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCheckServiceImpl.java
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
#	science-admin/src/main/java/com/yiboshi/science/service/impl/ComUnitServiceImpl.java
    27045d6c
Name
Last commit
 Last update
.idea Loading commit data...
science-admin Loading commit data...
science-base Loading commit data...
.gitignore Loading commit data...
README.md Loading commit data...
autodeploy.sh Loading commit data...
ci-setingss.xml Loading commit data...
pom.xml Loading commit data...
yn-health-science.iml Loading commit data...