Merge remote-tracking branch 'origin/dev' into dev

wenwj

2025-04-08 67197f9b3c643a99a01403d80aa20e474cfda452

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java

 aps-modules/aps-system/src/main/resources/bootstrap.yml

@@ -15,6 +15,9 @@
      discovery:
        # 服务注册地址
        server-addr: 192.168.50.160:8848
#        ip: 192.168.50.13
#        metadata:
#          local: zhl
      config:
        # 配置中心地址
        server-addr: 192.168.50.160:8848

 aps-modules/aps-upload/src/main/java/com/aps/upload/service/impl/CoreServiceImpl.java

@@ -1,6 +1,6 @@
package com.aps.upload.service.impl;

import com.aps.upload.service.ICoreService;
import com.aps.core.service.ICoreService;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;