ERP_override.git

ERP

guoyujie

2025-10-14 81cad8df0f1b33700e7fc80f271eda7f1180efb0

refs
用户	guoyujie <guoyujie@ng.com>
	星期二, 十月 14, 2025 14:51 +0800
提交者	guoyujie <guoyujie@ng.com>
	星期二, 十月 14, 2025 14:51 +0800
提交	81cad8df0f1b33700e7fc80f271eda7f1180efb0
目录	a14f6a55fd5164a9f199cceb29d22fc34b79b339 目录 \| zip \| gz
parent	eea44a94c998e69c33d52b39baf65bf944f0f768 查看 \| 对比 a54f89e2bdbcc499b495a8b06930751b45ecfc9c 查看 \| 对比

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

4个文件已修改

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizationRectPrint.vue	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java	45 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史