225 Commits

Author SHA1 Message Date
2b48faf50d Merge branch 'yt' into dev 2025-08-13 10:52:19 +08:00
fab8d88faf 小程序修改代码 2025-08-13 10:52:02 +08:00
5fc1378051 -------- 2025-08-12 19:36:03 +08:00
12480f3706 Merge remote-tracking branch 'origin/dev' into dev 2025-08-10 16:22:31 +08:00
05af3d221c 修复了验证码bug 2025-08-10 16:22:02 +08:00
f17226cc97 小程序修改代码 2025-08-10 11:43:30 +08:00
d5e4f0d7eb 小程序修改代码 2025-08-10 11:28:38 +08:00
d17f6f09c5 修复了验证码bug 2025-08-10 11:25:09 +08:00
8a085da7dc 修复了验证码bug 2025-08-09 22:30:47 +08:00
f871831cbc 修复了禅道的一系列bug 2025-08-09 01:21:59 +08:00
c1817b6255 模拟了微信支付功能 2025-08-08 19:21:04 +08:00
85df7bfc4e 添加了修改头像的功能 2025-08-08 13:48:37 +08:00
990f1850b1 加入了搜索功能 2025-08-07 20:18:00 +08:00
c7dd90f669 修改部分bug 2025-08-07 19:56:53 +08:00
d1b4fa8ca3 修改了经理端部分代码 2025-08-07 11:45:28 +08:00
3996895c0d Merge remote-tracking branch 'origin/dev' into dev 2025-08-06 13:31:59 +08:00
c5f3287e80 ------- 2025-08-06 13:31:38 +08:00
b6a59ce3d8 小程序修改代码 2025-08-06 13:16:08 +08:00
2a1082fc9f Merge remote-tracking branch 'origin/dev' into dev 2025-08-04 20:16:18 +08:00
90162ad74f ------- 2025-08-04 20:15:51 +08:00
50e892adc4 小程序提交 2025-08-04 16:33:23 +08:00
0587539253 小程序提交 2025-08-04 16:31:21 +08:00
5c2082adf4 小程序提交 2025-08-04 16:27:52 +08:00
fa2a7b3499 小程序提交 2025-07-20 18:22:59 +08:00
a1d21c67b8 commission--yt-commit 2025-06-30 13:12:06 +08:00
53d0cc6767 commission--yt-commit 2025-06-25 15:45:25 +08:00
1a8bcbec9f commission--yt-commit 2025-06-25 15:44:12 +08:00
0e20be0425 commission--yt-commit 2025-06-23 10:03:08 +08:00
2350346d95 commission--yt-commit 2025-06-19 14:13:59 +08:00
b360697a37 Merge branch 'feture-yt' into dev
# Conflicts:
#	pages/loginModule/register/register.js
2025-06-17 19:27:36 +08:00
9241e3bce3 Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 19:26:09 +08:00
8c0a108e8f commission--yt-commit 2025-06-17 19:25:58 +08:00
ade53fa60f Merge pull request '测试分支合并请求333' (#11) from feature-xxx into dev
Reviewed-on: http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu/pulls/11
2025-06-17 11:13:11 +00:00
9b8b40d2ed 测试分支合并请求333 2025-06-17 19:10:59 +08:00
5093eb3058 Merge branch 'feature-xxx' into dev
# Conflicts:
#	app.js
2025-06-17 18:59:05 +08:00
3ce43e880d 测试分支合并请求2222 2025-06-17 18:43:08 +08:00
1e2593fd3b 测试分支合并请求 2025-06-17 18:17:05 +08:00
a5da14642b Merge branch 'dev' into feature-xxx 2025-06-17 01:10:09 +00:00
0de7e859c2 测试分支合并请求 2025-06-17 09:04:01 +08:00
152b4995ca Merge pull request 'feature-xxx' (#7) from feature-xxx into dev 2025-06-17 00:42:07 +00:00
a797150e3e 测试分支合并请求 2025-06-17 08:39:16 +08:00
3d1e60edc5 测试分支合并请求 2025-06-17 08:38:14 +08:00
c93b471625 测试分支合并请求 2025-06-17 08:26:41 +08:00
e608c02f8b Merge remote-tracking branch 'origin/feature-xxx' into feature-xxx 2025-06-16 23:33:12 +08:00
2399168f8e Merge pull request 'Merge pull request '测试分支合并请求' (#4) from feature-xxx into dev' (#5) from dev into feature-xxx
Reviewed-on: http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu/pulls/5
2025-06-16 15:31:59 +00:00
949d39b1b9 测试分支合并请求 2025-06-16 23:30:02 +08:00
1ef99032ec Merge pull request '测试分支合并请求' (#4) from feature-xxx into dev
Reviewed-on: http://154.8.193.216:3030/admin1/qingcheng-xiaochengxu/pulls/4
2025-06-16 15:24:38 +00:00
d6761b460c Merge branch 'dev' into feature-xxx 2025-06-16 15:23:58 +00:00
d6bfd2d262 测试分支合并请求 2025-06-16 23:21:21 +08:00
bd98398c4e Merge branch 'feture-yt' into dev
# Conflicts:
#	app.json
2025-06-16 16:18:29 +08:00