Merge remote-tracking branch 'refs/remotes/origin/xlj' into feature/order

# Conflicts: # tashow-module/tashow-module-infra/src/main/resources/application-local.yaml
2025-10-16 15:28:17 +08:00
parent e5f0d57286 4ae13cf1e6
commit f7d4ef8e4c
4 changed files with 7 additions and 3 deletions
--- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java
@@ -12,7 +12,6 @@ import java.util.List;
 * @author 芋道源码
 */
@Data
-
 public class CategoryDto {

    /**