Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-12 0365eb9f81bd331b0adde6d77fb331213a2c7b30

Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

 src/main/java/com/ruoyi/basic/controller/CustomerController.java

@@ -148,8 +148,8 @@
     * 私海客户流回公海
     */
    @Log(title = "客户档案", businessType = BusinessType.OTHER)
    @PostMapping("/back")
    public R back(Long id) {
    @PostMapping("/back/{id}")
    public R back(@PathVariable("id") Long id) {
        return R.ok(customerService.back(id));
    }
}

 src/main/java/com/ruoyi/basic/dto/StorageBlobVO.java

@@ -10,6 +10,10 @@
     */
    private String previewURL;


    private String url;
    private String name;

    /**
     * 下载地址
     */

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -375,7 +375,7 @@
        //将客户的type改为1 且直接分配给当前用户
        Customer customer = customerMapper.selectById(id);
        customer.setType(1);
        customer.setIsAssigned(1);
        customer.setIsAssigned(0);
        return this.updateById(customer);
    }


 src/main/java/com/ruoyi/basic/utils/FileUtil.java

@@ -395,6 +395,8 @@
            StorageBlobVO storageBlobVO = new StorageBlobVO();
            BeanUtils.copyProperties(storageBlob, storageBlobVO);
            storageBlobVO.setPreviewURL(buildSignedPreviewUrl(storageBlobVO));
            storageBlobVO.setUrl(buildSignedPreviewUrl(storageBlobVO));
            storageBlobVO.setName(storageBlob.getOriginalFilename());
            storageBlobVO.setDownloadURL(buildSignedDownloadUrl(storageBlobVO));
            storageBlobVO.setUrl(buildSignedPreviewUrl(storageBlobVO));
            storageBlobVO.setName(storageBlob.getOriginalFilename());