~admin/HangZhouMes.git

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

wangfei

2024-10-17 a5674993536bf02fab4120ce03295e22215033ef

refs
用户	wangfei <3597712270@qq.com>
	星期四, 十月 17, 2024 09:30 +0800
提交者	wangfei <3597712270@qq.com>
	星期四, 十月 17, 2024 09:30 +0800
提交	a5674993536bf02fab4120ce03295e22215033ef
目录	6da05cf24c1a6f67c49e441d8ebcf360916ec604 目录 \| zip \| gz
parent	32bc1fb9a3692c460d21f8094ca80f1e0e0eb6a6 查看 \| 对比 a6114a739396420028f6a5397697e1e9ca90cc33 查看 \| 对比

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

# Conflicts:
#	UI-Project/src/lang/zh.js
#	UI-Project/src/views/NewPage.vue
#	UI-Project/src/views/Returns/upreturns.vue
#	UI-Project/src/views/Slicecage/slicecage.vue
#	UI-Project/src/views/UnLoadGlass/loadmachinerack.vue

1个文件已修改

UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue

16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史