From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/HollowOrderDTO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/dto/OrderDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/HollowOrderDTO.java
similarity index 97%
rename from hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/dto/OrderDTO.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/HollowOrderDTO.java
index 3fb9134..f74967c 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/dto/OrderDTO.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/HollowOrderDTO.java
@@ -1,4 +1,4 @@
-package com.mes.hollow.entity.dto;
+package com.mes.order.entity;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@
  * @Description:
  */
 @Data
-public class OrderDTO {
+public class HollowOrderDTO {
 
     /**
      * <璁㈠崟琛�>

--
Gitblit v1.8.0