Merge remote-tracking branch 'origin/feature/HTJ-2.11.03-20250514' into...

Merge remote-tracking branch 'origin/feature/HTJ-2.11.03-20250514' into feature/HTJ-2.11.03-20250514 # Conflicts: # project.yaml

Merge remote-tracking branch 'origin/feature/HTJ-2.11.03-20250514' into...
Merge remote-tracking branch 'origin/feature/HTJ-2.11.03-20250514' into feature/HTJ-2.11.03-20250514 # Conflicts: # project.yaml
91e08943 · xujian · 7ba6aab8 · aec9fa92 · 91e08943
Commit 91e08943 authored May 26, 2025 by xujian
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

project.yaml project.yaml +2 -2

No files found.
--- a/project.yaml
+++ b/project.yaml
@@ -130,7 +130,7 @@ htj:
  - name: qrcode-modules-product-relation-pcb
    path: factory-tobacco-qrcode-modules-product-relation
    isEncryption: false
-    version: v25.05.23.1-2.11.03
+    version: v25.05.26-2.11.03
    isUpdate: false

  - name: qrcode-modules-product-report-pcb
@@ -148,7 +148,7 @@ htj:
  - name: qrcode-modules-product-upload-pcb
    path: factory-tobacco-qrcode-modules-product-upload
    isEncryption: true
-    version: v25.05.23.1-2.11.03
+    version: v25.05.26-2.11.03
    isUpdate: false

  - name: factory-tobacco-qrcode-modules-wip-relation