 jacy
|
fa69ced448
|
Merge pull request 'Dev v3.5.6' (#39) from dev into main
CI / verify (push) Waiting to run
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39
v3.5.6
|
2026-08-23 16:43:51 +08:00 |
|
|
jacy
|
a144a35c3d
|
Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38
|
2026-08-23 16:43:07 +08:00 |
|
|
jacy
|
7e12eb3ca6
|
v3.5.6版本迭代
CI / verify (pull_request) Waiting to run
|
2026-08-23 16:41:22 +08:00 |
|
|
jacy
|
608e3e5ec5
|
整理发布脚本
|
2026-08-23 14:37:36 +08:00 |
|
|
jacy
|
d98b0aefb0
|
整理上下文
|
2026-08-23 14:37:29 +08:00 |
|
|
jacy
|
18c5abea79
|
Merge pull request 'v3.5.5版本合并' (#37) from dev into main
CI / verify (push) Waiting to run
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/37
|
2026-08-23 12:30:04 +08:00 |
|
|
jacy
|
012626f6bd
|
Merge pull request 'v3.5.5版本上传' (#36) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36
|
2026-08-23 12:29:33 +08:00 |
|
|
jacy
|
22cd00da42
|
v3.5.5版本上传
CI / verify (pull_request) Waiting to run
v3.5.5
|
2026-08-23 12:26:57 +08:00 |
|
|
jacy
|
5d4ed566de
|
merge(dev): HQ product list as SPU with expandable SKUs
CI / verify (push) Has been cancelled
|
2026-08-21 23:52:41 +08:00 |
|
|
jacy
|
3004a65b35
|
Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev
|
2026-08-21 23:52:37 +08:00 |
|
|
jacy
|
f9161368e1
|
feat(admin): show HQ product list as SPU with expandable SKUs
Group catalog rows by product, add paid bottle sales, and keep multi-SKU fulfillment on SKU rows only.
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-08-21 23:52:28 +08:00 |
|
|
jacy
|
8a061f085f
|
提交v3.5.4 版本号小程序
v3.5.4
|
2026-08-21 17:49:53 +08:00 |
|
|
jacy
|
b20e566a65
|
logo3
|
2026-08-21 17:39:11 +08:00 |
|
|
jacy
|
5fdddae41c
|
merge(dev): v3.5.4 规格主图与门店使用规则
CI / verify (push) Has been cancelled
|
2026-08-21 17:37:20 +08:00 |
|
|
jacy
|
7d2e4ef57e
|
merge(dev_jacy): v3.5.4 规格主图与门店使用规则
|
2026-08-21 17:37:09 +08:00 |
|
|
jacy
|
4d434c9c67
|
v3.5.4 规格主图、门店使用规则与收银台 logo
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-08-21 17:36:53 +08:00 |
|
|
jacy
|
22c0b03a47
|
Merge pull request 'Dev' (#35) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/35
|
2026-08-21 16:24:07 +08:00 |
|
|
jacy
|
73fd27bdf6
|
Merge pull request 'v3.5.4版本提交，修改api' (#34) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/34
|
2026-08-21 16:23:54 +08:00 |
|
|
jacy
|
62e61a9e63
|
v3.5.4版本提交，修改api
CI / verify (pull_request) Has been cancelled
|
2026-08-21 16:22:53 +08:00 |
|
|
jacy
|
f2d03e2595
|
Merge pull request 'v3.5.4' (#33) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/33
|
2026-08-21 15:50:30 +08:00 |
|
|
jacy
|
cd9696bc1c
|
Merge pull request 'v3.5.4版本提交' (#32) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/32
|
2026-08-21 15:50:07 +08:00 |
|
|
jacy
|
a01217539c
|
v3.5.4版本提交
CI / verify (pull_request) Has been cancelled
|
2026-08-21 15:48:15 +08:00 |
|
|
jacy
|
0c28c204b2
|
Merge pull request 'Dev' (#31) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/31
v3.5.3
|
2026-08-20 20:23:20 +08:00 |
|
|
jacy
|
b5d4f8b27c
|
Merge pull request 'v3.5.3版本更新2' (#30) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/30
|
2026-08-20 20:23:03 +08:00 |
|
|
jacy
|
26334ed072
|
v3.5.3版本更新2
CI / verify (pull_request) Has been cancelled
|
2026-08-20 20:09:05 +08:00 |
|
|
jacy
|
9a80f0f8d6
|
Merge pull request 'v3.5.3版本更新1' (#29) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/29
|
2026-08-20 18:55:43 +08:00 |
|
|
jacy
|
e7f49a9639
|
Merge pull request 'v3.5.3版本更新1' (#28) from dev_jacy into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/28
|
2026-08-20 18:55:18 +08:00 |
|
|
jacy
|
fc2e5b65de
|
v3.5.3版本更新1
CI / verify (pull_request) Has been cancelled
|
2026-08-20 18:54:15 +08:00 |
|
|
jacy
|
f941dcf072
|
Merge pull request 'Dev' (#27) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/27
|
2026-08-20 15:06:24 +08:00 |
|
|
jacy
|
e8b585e623
|
Merge pull request '增加音效逻辑' (#26) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/26
|
2026-08-20 15:06:07 +08:00 |
|
|
jacy
|
ee493823bf
|
增加音效逻辑
CI / verify (pull_request) Has been cancelled
v3.5.2
|
2026-08-20 15:04:54 +08:00 |
|
|
jacy
|
5702266276
|
Merge pull request 'Dev jacy' (#25) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/25
|
2026-08-20 13:43:29 +08:00 |
|
|
jacy
|
3382d36a6c
|
Merge pull request 'Dev jacy 大屏优化' (#24) from dev_jacy into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/24
|
2026-08-20 13:43:06 +08:00 |
|
|
jacy
|
8b5bb6a981
|
大屏显示优化
CI / verify (pull_request) Has been cancelled
|
2026-08-20 13:41:50 +08:00 |
|
|
jacy
|
0a36188b35
|
调整优化大屏
|
2026-08-20 12:55:11 +08:00 |
|
|
jacy
|
9b8e3f1347
|
Merge pull request 'v3.5.2 大屏调整' (#23) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/23
|
2026-08-20 12:01:21 +08:00 |
|
|
jacy
|
a8a37fbc4a
|
Merge pull request 'v3.5.2 大屏调整' (#22) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/22
|
2026-08-20 12:00:57 +08:00 |
|
|
jacy
|
6cf66c722c
|
v3.5.2 大屏调整
CI / verify (pull_request) Has been cancelled
|
2026-08-20 11:58:15 +08:00 |
|
|
jacy
|
1440a59fc8
|
Merge pull request 'Dev' (#21) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/21
v3.5.1
|
2026-08-20 00:54:54 +08:00 |
|
|
jacy
|
e34416a9b3
|
Merge pull request 'Dev jacy mock 支付调整' (#20) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/20
|
2026-08-20 00:54:17 +08:00 |
|
|
jacy
|
4db21cf1a1
|
mockpay功能调试
CI / verify (pull_request) Has been cancelled
|
2026-08-20 00:51:18 +08:00 |
|
|
jacy
|
2f633b307c
|
删除h5user端和hq小程序端
|
2026-08-19 16:21:06 +08:00 |
|
|
jacy
|
62353a6800
|
整理开发文档
|
2026-08-19 16:20:33 +08:00 |
|
|
jacy
|
11659484c6
|
Merge pull request 'v3.5.1 版本更新' (#19) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/19
|
2026-08-19 16:01:31 +08:00 |
|
|
jacy
|
6c44e9c56f
|
Merge pull request 'v3.5.1 版本更新' (#18) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/18
|
2026-08-19 16:00:56 +08:00 |
|
|
jacy
|
233ed0af3b
|
v3.5.1 版本更新
CI / verify (pull_request) Has been cancelled
|
2026-08-19 15:54:51 +08:00 |
|
|
jacy
|
0fb7ab7abb
|
Merge pull request 'v3.4.18' (#17) from dev into main
CI / verify (push) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/17
v3.4.18
|
2026-08-17 23:45:19 +08:00 |
|
|
jacy
|
905e145af3
|
Merge pull request 'v3.4.18' (#16) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/16
|
2026-08-17 23:45:00 +08:00 |
|
|
jacy
|
7dd5fdfb12
|
优化门店端结算页面的UI
CI / verify (pull_request) Has been cancelled
|
2026-08-17 23:43:45 +08:00 |
|
|
jacy
|
48d6900ab6
|
fix(iam): 合伙人登录双拦截——子账号status=DISABLED 与 主账号bindingStatus=PAUSED 均拒绝登录
CI / verify (push) Has been cancelled
|
2026-08-17 23:39:53 +08:00 |
|