Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-13 83f738105416c9b11e3b7c5246a0980e41b6650e

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/HollowOrderDTO.java

File was renamed from hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/dto/OrderDTO.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 {

    /**
     * <订单表>