From e30df6bade00a5f4919de44946277b2db7cd3426 Mon Sep 17 00:00:00 2001
From: zhongyuyan <zhongyuyan1@huawei.com>
Date: Thu, 6 Apr 2023 06:18:40 +0000
Subject: [PATCH 1/2] =?UTF-8?q?!100=20=E7=BC=96=E8=AF=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20*=20IssueNo:=20#I6T8OJ:=E7=BC=96=E8=AF=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DFX/Debug/README_zh.md                       | 1 -
 DFX/Debug/entry/src/main/module.json5        | 1 -
 media/GamePuzzle/entry/src/main/module.json5 | 1 -
 media/Image/entry/src/main/module.json5      | 1 -
 media/ImageShow/README_zh.md                 | 2 +-
 media/ImageShow/entry/src/main/module.json5  | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/DFX/Debug/README_zh.md b/DFX/Debug/README_zh.md
index b4cc1630..63e8b8ac 100644
--- a/DFX/Debug/README_zh.md
+++ b/DFX/Debug/README_zh.md
@@ -20,7 +20,6 @@
 
 ```
 entry/src/main/ets/
-|---Application
 |---component
 |   |---DebugInfo.ets                  // Debug信息页面
 |---data
diff --git a/DFX/Debug/entry/src/main/module.json5 b/DFX/Debug/entry/src/main/module.json5
index 6267f62c..0c57f4e6 100644
--- a/DFX/Debug/entry/src/main/module.json5
+++ b/DFX/Debug/entry/src/main/module.json5
@@ -17,7 +17,6 @@
   "module": {
     "name": "entry",
     "type": "entry",
-    "srcEntrance": "./ets/Application/MyAbilityStage.ts",
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
diff --git a/media/GamePuzzle/entry/src/main/module.json5 b/media/GamePuzzle/entry/src/main/module.json5
index 5638aa42..12e08987 100644
--- a/media/GamePuzzle/entry/src/main/module.json5
+++ b/media/GamePuzzle/entry/src/main/module.json5
@@ -17,7 +17,6 @@
   "module": {
     "name": "entry",
     "type": "entry",
-    "srcEntrance": "./ets/Application/AbilityStage.ts",
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
diff --git a/media/Image/entry/src/main/module.json5 b/media/Image/entry/src/main/module.json5
index 7fc73c90..74d76daa 100644
--- a/media/Image/entry/src/main/module.json5
+++ b/media/Image/entry/src/main/module.json5
@@ -17,7 +17,6 @@
   "module": {
     "name": "entry",
     "type": "entry",
-    "srcEntrance": "./ets/Application/MyAbilityStage.ts",
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
diff --git a/media/ImageShow/README_zh.md b/media/ImageShow/README_zh.md
index 952a0205..7b30c65d 100644
--- a/media/ImageShow/README_zh.md
+++ b/media/ImageShow/README_zh.md
@@ -4,7 +4,7 @@
 
 本示例展示从相册选择图片展示在商品评价页面。
 
-本示例使用 [TextArea](https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/ts-basic-components-textarea-0000001427902464-V3) 组件实现多文本属于，使用 [mediaLibrary](https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-medialibrary-0000001478061921-V3#ZH-CN_TOPIC_0000001478061921__medialibrary) 实现图片的获取，选择。
+本示例使用 [TextArea](https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/ts-basic-components-textarea-0000001427902464-V3) 组件实现多文本输入，使用 [mediaLibrary](https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-medialibrary-0000001478061921-V3#ZH-CN_TOPIC_0000001478061921__medialibrary) 实现图片的获取与选择。
 
 使用说明： 
 
diff --git a/media/ImageShow/entry/src/main/module.json5 b/media/ImageShow/entry/src/main/module.json5
index ebce4cb0..bf83fb60 100644
--- a/media/ImageShow/entry/src/main/module.json5
+++ b/media/ImageShow/entry/src/main/module.json5
@@ -17,7 +17,6 @@
   "module": {
     "name": "entry",
     "type": "entry",
-    "srcEntrance": "./ets/Application/MyAbilityStage.ts",
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-- 
Gitee


From a9fef277fc8dcfdfbfd5de7bb469dfb5db676250 Mon Sep 17 00:00:00 2001
From: zwx1094577 <zhongyuyan1@huawei.com>
Date: Wed, 19 Apr 2023 11:15:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?IssueNo:=20#I6WWRJ:hvigorVersion=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=95=B4=E6=94=B9=20Description:=20HvigorVersion=20ve?=
 =?UTF-8?q?rsion=20rectification.=20Sig:=20SIG=5Fsamples=20Feature=20or=20?=
 =?UTF-8?q?Bugfix:=20Feature=20Binary=20Source:=20No?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zwx1094577 <zhongyuyan1@huawei.com>
---
 DFX/Debug/hvigor/hvigor-config.json5                    | 4 ++--
 ETSUI/HealthyDiet/hvigor/hvigor-config.json5            | 4 ++--
 ETSUI/PatternLock/hvigor/hvigor-config.json5            | 4 ++--
 ETSUI/TransitionAnimation/hvigor/hvigor-config.json5    | 4 ++--
 MultiDeviceAppDev/MusicAlbum/hvigor/hvigor-config.json5 | 4 ++--
 data/Preferences/hvigor/hvigor-config.json5             | 4 ++--
 data/Search/hvigor/hvigor-config.json5                  | 4 ++--
 media/GamePuzzle/hvigor/hvigor-config.json5             | 4 ++--
 media/Image/hvigor/hvigor-config.json5                  | 4 ++--
 media/ImageShow/hvigor/hvigor-config.json5              | 4 ++--
 network/WebSocket/hvigor/hvigor-config.json5            | 4 ++--
 security/Cipher/hvigor/hvigor-config.json5              | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/DFX/Debug/hvigor/hvigor-config.json5 b/DFX/Debug/hvigor/hvigor-config.json5
index 52c95a4f..5d9bed61 100644
--- a/DFX/Debug/hvigor/hvigor-config.json5
+++ b/DFX/Debug/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
\ No newline at end of file
diff --git a/ETSUI/HealthyDiet/hvigor/hvigor-config.json5 b/ETSUI/HealthyDiet/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/ETSUI/HealthyDiet/hvigor/hvigor-config.json5
+++ b/ETSUI/HealthyDiet/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/ETSUI/PatternLock/hvigor/hvigor-config.json5 b/ETSUI/PatternLock/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/ETSUI/PatternLock/hvigor/hvigor-config.json5
+++ b/ETSUI/PatternLock/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/ETSUI/TransitionAnimation/hvigor/hvigor-config.json5 b/ETSUI/TransitionAnimation/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/ETSUI/TransitionAnimation/hvigor/hvigor-config.json5
+++ b/ETSUI/TransitionAnimation/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/MultiDeviceAppDev/MusicAlbum/hvigor/hvigor-config.json5 b/MultiDeviceAppDev/MusicAlbum/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/MultiDeviceAppDev/MusicAlbum/hvigor/hvigor-config.json5
+++ b/MultiDeviceAppDev/MusicAlbum/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/data/Preferences/hvigor/hvigor-config.json5 b/data/Preferences/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/data/Preferences/hvigor/hvigor-config.json5
+++ b/data/Preferences/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/data/Search/hvigor/hvigor-config.json5 b/data/Search/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/data/Search/hvigor/hvigor-config.json5
+++ b/data/Search/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/media/GamePuzzle/hvigor/hvigor-config.json5 b/media/GamePuzzle/hvigor/hvigor-config.json5
index 52c95a4f..5d9bed61 100644
--- a/media/GamePuzzle/hvigor/hvigor-config.json5
+++ b/media/GamePuzzle/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
\ No newline at end of file
diff --git a/media/Image/hvigor/hvigor-config.json5 b/media/Image/hvigor/hvigor-config.json5
index 52c95a4f..5d9bed61 100644
--- a/media/Image/hvigor/hvigor-config.json5
+++ b/media/Image/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
\ No newline at end of file
diff --git a/media/ImageShow/hvigor/hvigor-config.json5 b/media/ImageShow/hvigor/hvigor-config.json5
index 52c95a4f..5d9bed61 100644
--- a/media/ImageShow/hvigor/hvigor-config.json5
+++ b/media/ImageShow/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
\ No newline at end of file
diff --git a/network/WebSocket/hvigor/hvigor-config.json5 b/network/WebSocket/hvigor/hvigor-config.json5
index 32ec7cda..ff688122 100644
--- a/network/WebSocket/hvigor/hvigor-config.json5
+++ b/network/WebSocket/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
diff --git a/security/Cipher/hvigor/hvigor-config.json5 b/security/Cipher/hvigor/hvigor-config.json5
index 52c95a4f..5d9bed61 100644
--- a/security/Cipher/hvigor/hvigor-config.json5
+++ b/security/Cipher/hvigor/hvigor-config.json5
@@ -1,6 +1,6 @@
 {
-  "hvigorVersion": "2.0.0-rc.2.s",
+  "hvigorVersion": "2.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.0.0-rc.2.s"
+    "@ohos/hvigor-ohos-plugin": "2.0.0"
   }
 }
\ No newline at end of file
-- 
Gitee