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

# Conflicts:
#	platform-shop/src/main/java/com/platform/service/impl/BrandServiceImpl.java

platform-shop/src/main/java/com/platform/service/impl/BrandServiceImpl.java

@@ -102,7 +102,7 @@ public class BrandServiceImpl implements BrandService {
         if(StringUtils.isNotBlank(orderBy)){
             queryWrapper.last("order by b."+ orderBy);
         }else {
-            queryWrapper.orderByDesc("b.id");
+            queryWrapper.orderByAsc("b.id");
         }
         IPage<BrandEntity> page = new Page<>(pageNum , pageSize);
         IPage<BrandEntity> resultPage = new Page<>();