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

jiaosong

2023-09-18 2a8241df4493a36b046855f2283b1c3da9e6bfbe

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

@@ -191,7 +191,7 @@
            queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
        }else {
            queryWrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
                    .or().eq(Brand::getType,Constants.ZERO)
                    .or().eq(Brand::getType,Constants.ONE)
            );
        }
        queryWrapper.lambda().orderByAsc(Brand::getSortnum);