Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-07-28 59d34cb3d22f4f99805f78997b7229a46bec4fe5

 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java

@@ -3,14 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Data