Commit 2bf71982 authored by xujian's avatar xujian

Merge branch 'develop' into feature/HTJ-2.11.03-20250514

# Conflicts:
#	Jenkinsfile
#	project.yaml
parents 5c05b2cf 37d835a7
......@@ -148,8 +148,8 @@ htj:
- name: qrcode-modules-product-upload-pcb
path: factory-tobacco-qrcode-modules-product-upload
isEncryption: true
version: v2.11.04-25.06.10.002
isUpdate: true
version: 2.11.02
isUpdate: false
- name: factory-tobacco-qrcode-modules-wip-relation
path: factory-tobacco-qrcode-modules-wip-relation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment