Merge branch 'feature/襄阳接口开发' into release/HTJ-2.03.003-20241108

# Conflicts: # project.yaml

Merge branch 'feature/襄阳接口开发' into release/HTJ-2.03.003-20241108
# Conflicts: # project.yaml
1ba47552 · jwf · 8eb6d2b2 · 74b2d139 · 1ba47552
Commit 1ba47552 authored Dec 30, 2024 by jwf
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

project.yaml
+12 -12

No files found.
--- a/project.yaml
+++ b/project.yaml
@@ -14,7 +14,7 @@ base:
  type: "mvn"
  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-basic.git"
  namespace: qrcode-xxx
-  isUpdate: true
+  isUpdate: false
  module:
  - name: factory-tobacco-qrcode-auth
    path: factory-tobacco-qrcode-auth
@@ -56,8 +56,8 @@ core:
  - name: factory-tobacco-qrcode-modules-device
    path: factory-tobacco-qrcode-modules-device
    isEncryption: false
-    version: v24.12.03-2.03.003.1-cs
+    version: v24.12.30
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-monitor-alarm
    path: factory-tobacco-qrcode-modules-monitor-alarm
@@ -88,19 +88,19 @@ htj:
  type: "mvn"
  url: "http://114.116.202.8:18808/factory-tobacco/factory-tobacco-qrcode-htj.git"
  namespace: qrcode-xxx
-  isUpdate: true
+  isUpdate: false
  module:
  - name: factory-tobacco-qrcode-module-monitoring-platform
    path: factory-tobacco-qrcode-module-monitoring-platform
    isEncryption: false
-    version: v24.12.26
+    version: v24.12.23-2.03.003.1-cs
-    isUpdate: true
+    isUpdate: false
  - name: factory-tobacco-qrcode-module-product-syncmes
    path: factory-tobacco-qrcode-module-product-syncmes
    isEncryption: false
-    version: v24.09.26
+    version: v24.12.30
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-db-version-control
    path: factory-tobacco-qrcode-modules-db-version-control
@@ -123,8 +123,8 @@ htj:
  - name: factory-tobacco-qrcode-modules-product-relation
    path: factory-tobacco-qrcode-modules-product-relation
    isEncryption: false
-    version: v24.12.24-2.03.003-hh
+    version: v24.12.30
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-product-report
    path: factory-tobacco-qrcode-modules-product-report
@@ -141,8 +141,8 @@ htj:
  - name: factory-tobacco-qrcode-modules-product-upload
    path: factory-tobacco-qrcode-modules-product-upload
    isEncryption: true
-    version: v24.12.19-2.03.003-kf
+    version: v24.12.30
-    isUpdate: false
+    isUpdate: true
  - name: factory-tobacco-qrcode-modules-wip-relation
    path: factory-tobacco-qrcode-modules-wip-relation