akun 3a6b90197c Merge remote-tracking branch 'origin/competition' into deployment_gateway_20240416 ...

# Conflicts:
#	pom.xml
#	sf-admin/pom.xml
#	sf-admin/src/main/resources/application.yml
#	sf-service/pom.xml
#	sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentApplyEnvironmentController.java
#	sf-system/src/main/java/com/sf/system/deployment/controller/DeploymentServicePublishController.java
#	sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentApplyEnvironment.java
#	sf-system/src/main/java/com/sf/system/deployment/domain/DeploymentServicePublish.java
#	sf-system/src/main/java/com/sf/system/deployment/mapper/DeploymentApplyEnvironmentMapper.java
#	sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentApplyEnvironmentService.java
#	sf-system/src/main/java/com/sf/system/deployment/service/IDeploymentServicePublishService.java
#	sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentApplyEnvironmentServiceImpl.java
#	sf-system/src/main/java/com/sf/system/deployment/service/impl/DeploymentServicePublishServiceImpl.java
#	sf-system/src/main/resources/mapper/system/deployment/DeploymentApplyEnvironmentMapper.xml
#	sf-system/src/main/resources/mapper/system/deployment/DeploymentServicePublishMapper.xml
#	sf-ui/package.json
#	sf-ui/src/api/FDS/whiteList.js
#	sf-ui/src/api/deploy/INFO.js
#	sf-ui/src/api/deployment/publish.js
#	sf-ui/src/components/FileUpload/index.vue
#	sf-ui/src/components/ImageUpload/index.vue
#	sf-ui/src/store/modules/permission.js
#	sf-ui/src/store/modules/user.js
#	sf-ui/src/utils/application.js
#	sf-ui/src/utils/request.js
#	sf-ui/src/views/FDS/installationList/add.vue
#	sf-ui/src/views/FDS/installationList/detail.vue
#	sf-ui/src/views/FDS/installationList/edit.vue
#	sf-ui/src/views/FDS/installationList/index.vue
#	sf-ui/src/views/FDS/publishList/components/addPack.vue
#	sf-ui/src/views/FDS/publishList/index.vue
#	sf-ui/src/views/FDS/whiteListManagement/add.vue
#	sf-ui/src/views/FDS/whiteListManagement/edit.vue
#	sf-ui/src/views/FDS/whiteListManagement/index.vue
#	sf-ui/src/views/deploy/INFO/add.vue
#	sf-ui/src/views/deployment/publish/index.vue
#	sf-ui/src/views/indexNew.vue
#	sf-ui/src/views/service/goods/index.vue
#	sf-ui/vue.config.js

2024-05-10 14:21:47 +08:00

..

src/main/java/com/sf/common

Merge remote-tracking branch 'origin/competition' into deployment_gateway_20240416

2024-05-10 14:21:47 +08:00

pom.xml

编号：ZSSAC-585 描述：生成二维码与文件上传修改

2024-04-23 15:20:38 +08:00