YiWuProject.git

义乌项目

parent: 8b7ae914 | 补丁 | 提交 | show whitespace

Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into ae...

huang

2025-10-20 899813196f304b8e837f0dcff059b0110c82e110

Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya

# Conflicts:
#	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
#	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
#	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

2个文件已修改

	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -33,6 +33,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

/**
 * <p>

			@@ -33,6 +33,7 @@
			import java.util.Calendar;
			import java.util.Date;
			import java.util.List;
			import java.util.concurrent.atomic.AtomicInteger;

			/**
			* <p>