ERP_override.git

ERP

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

chenlu

2024-12-05 a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8

refs
用户	chenlu <1320612696@qq.com>
	星期四, 十二月 5, 2024 17:02 +0800
提交者	chenlu <1320612696@qq.com>
	星期四, 十二月 5, 2024 17:02 +0800
提交	a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8
目录	276a67bc054bfb4c653a9ab584f5f051d5811c27 目录 \| zip \| gz
parent	72dc8587cb6fa333dc4584d4ab7e376eea7a9f4f 查看 \| 对比 1dfc2a03837375e220b1afd00f352aa82273d223 查看 \| 对比

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

11个文件已修改

	north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/router/index.js	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/stores/sd/companySet/金华天成.js	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectMange.vue	311 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue	74 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史