Commit Graph

4 Commits

Author SHA1 Message Date
OTTO 99a9f5db54 Merge branch 'dev_PMS' of code.gitlink.org.cn:Gitlink/ruoyi-gitlink into dev_PMS_osredm
# Conflicts:
#	microservices-common/microservices-common-httpClient/src/main/java/com/microservices/common/httpClient/util/GitLinkRequestHelper.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/controller/PmsCiPipelinesController.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/PmsCiPipelineGraphics.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelineBuildYamlInputVo.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/domain/vo/PmsCiPipelinesUpdateVo.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/mapper/PmsCiPipelineGraphicsMapper.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/IPmsCiPipelineGraphicsService.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelineGraphicsServiceImpl.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/pipeline/service/impl/PmsCiPipelinesServiceImpl.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/controller/PmsProjectController.java
#	microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectServiceImpl.java
#	microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsCiPipelineGraphicsMapper.xml
#	ruoyi-modules/ruoyi-wiki/src/main/java/com/ruoyi/wiki/WikiApiApplication.java
2024-05-30 11:42:46 +08:00
OTTO efb5edce16 feat(微服务平台重命名): 去除ruoyi相关标识 2024-05-27 16:51:36 +08:00
OTTO d0aff2d560 feat(微服务平台重命名): GroupId调整为com.microservices
调整公共模块
2024-05-27 14:37:44 +08:00
OTTO 5a7aaff499 feat(微服务平台重命名): 微服务平台命名调整为microservices 2024-05-27 10:10:44 +08:00