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

k94314517

2023-09-20 a2735382e853f89465e328dce2df9f3f465bcda9

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

 server/company/src/main/java/com/doumee/api/business/GoodsController.java

@@ -163,7 +163,6 @@
        return ApiResponse.success(goodsService.batchUpdateDisableById(batchDisableDTO));
    }


    @ApiOperation("列表 - H5")
    @PostMapping("/list")
    public ApiResponse<List<Goods>> findList (@RequestBody Goods goods) {

 server/platform/src/main/resources/application.yml

@@ -11,7 +11,7 @@
#  application:
#  name: doumeemes
  profiles:
    active: dev
    active: pro

  # JSON返回配置
  jackson:

 server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java

@@ -461,10 +461,11 @@

    private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
        if(StringUtils.isNotBlank(bgImg)){
            bgImg = bgImg.replace("/n1/jfs/", "/n0/jfs/");
//            String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
            String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
            if(StringUtils.isNotBlank(img)){
                img = img.replace("/n1/jfs/", "/n0/jfs/");

                Multifile f = new Multifile();
                f.setFileurl(img);
                f.setObjType(Constants.ONE);