Merge remote-tracking branch 'origin/dev' into dev

feat(custom):
Merge branch 'dev' into test
2024-05-20 20:01:39 +08:00 · 2024-05-20 20:00:08 +08:00 · 2024-05-20 18:18:58 +08:00 · 2024-05-17 15:34:24 +08:00 · 2024-05-16 16:37:17 +08:00 · 2024-05-16 14:43:06 +08:00
2 changed files with 1 additions and 20727 deletions
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
 		"@tarojs/shared": "3.6.29",
 		"@tarojs/taro": "3.6.29",
 		"dayjs": "^1.11.10",
+		"pinia": "^2.1.7",
 		"vue": "^3.3.9"
 	},
 	"devDependencies": {
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Huakk	e796bdbc8a	Merge remote-tracking branch 'origin/dev' into dev All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-20 20:01:39 +08:00
Huakk	09840d72ed	feat(custom):	2024-05-20 20:00:08 +08:00
Huakk	4245ae6c80	Merge branch 'dev' into test All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-20 18:18:58 +08:00
Huakk	2db33b1889	Merge branch 'dev' into test All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-17 15:34:24 +08:00
Huakk	2392a34d9a	Merge branch 'dev' into test All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-16 16:37:17 +08:00
Huakk	cd6078156e	wip: All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-16 14:43:06 +08:00
Huakk	4c33c1c648	Merge branch 'dev' into test Some checks failed continuous-integration/drone/push Build is failing Details	2024-05-16 14:41:08 +08:00
Huakk	6bd7e2f62c	Merge branch 'dev' into test Some checks failed continuous-integration/drone/push Build is failing Details	2024-05-16 14:38:44 +08:00
Huakk	ff84bde907	Merge branch 'dev' into test Some checks failed continuous-integration/drone/push Build is failing Details	2024-05-16 14:35:27 +08:00
Huakk	e6f68c5ee8	fix(custom): All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-11 18:29:41 +08:00
Huakk	33eccf0a24	fix(custom): Some checks reported errors continuous-integration/drone/push Build was killed Details	2024-05-11 18:29:04 +08:00
Huakk	97c758e598	fix(custom): All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-11 17:59:10 +08:00
Huakk	c13705d96a	fix(custom): All checks were successful continuous-integration/drone/push Build is passing Details	2024-05-11 17:49:23 +08:00