Merge remote-tracking branch 'origin/main' into dev-v4.0.8

v4.0.8 客服卡片主包落地与微信内保存海报
merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报
2026-09-02 05:21:23 +08:00 · 2026-09-02 05:20:53 +08:00 · 2026-09-01 15:24:31 +08:00 · 2026-09-01 15:24:19 +08:00 · 2026-09-01 15:12:48 +08:00 · 2026-09-01 15:12:28 +08:00
2 changed files with 5 additions and 2 deletions
@@ -36,6 +36,7 @@ const STATUS_COLOR: Record<DevPlanVersionStatusDto, string> = {
  IN_PROGRESS: 'processing',
  TESTING: 'purple',
  RELEASED: 'green',
+  STOPPED: 'red',
 };

 function formatDuration(minutes?: number | null) {
@@ -46,11 +46,11 @@ export const DEV_PLAN_TASK_STATUS_LABELS: Record<DevPlanTaskStatusDto, string> =

 /** 开发计划版本状态 */

-export type DevPlanVersionStatusDto = 'PENDING' | 'IN_PROGRESS' | 'TESTING' | 'RELEASED';
+export type DevPlanVersionStatusDto = 'PENDING' | 'IN_PROGRESS' | 'TESTING' | 'RELEASED' | 'STOPPED';



-export const DEV_PLAN_VERSION_STATUSES = ['PENDING', 'IN_PROGRESS', 'TESTING', 'RELEASED'] as const;
+export const DEV_PLAN_VERSION_STATUSES = ['PENDING', 'IN_PROGRESS', 'TESTING', 'RELEASED', 'STOPPED'] as const;



@@ -64,6 +64,8 @@ export const DEV_PLAN_VERSION_STATUS_LABELS: Record<DevPlanVersionStatusDto, str

  RELEASED: '已上线',

+  STOPPED: '已停止',
+
 };
Author	SHA1	Message	Date
jacy	2e0518b5b7	Merge remote-tracking branch 'origin/main' into dev-v4.0.8 CI / verify (pull_request) Waiting to run Details	2026-09-02 05:21:23 +08:00
jacy	f8f652a0a6	v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (pull_request) Waiting to run Details	2026-09-02 05:20:53 +08:00
jacy	04d903c554	merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (push) Waiting to run Details	2026-09-01 15:24:31 +08:00
jacy	30bfcc0d93	merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报 CI / verify (pull_request) Waiting to run Details	2026-09-01 15:24:19 +08:00
jacy	0e883d3e70	merge(dev): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (push) Waiting to run Details	2026-09-01 15:12:48 +08:00
jacy	6a95f47860	merge(dev_jacy): v4.0.7 HQ 活动图快链与勾选导出 CI / verify (pull_request) Waiting to run Details	2026-09-01 15:12:28 +08:00
jacy	9a35c4aea9	merge(dev): 后台反收录与百度校验文件 CI / verify (push) Waiting to run Details	2026-09-01 09:12:11 +08:00
jacy	99c7f8caea	merge(dev_jacy): 后台反收录与百度校验文件 CI / verify (pull_request) Waiting to run Details	2026-09-01 09:12:08 +08:00
jacy	971b8aaa7b	merge(dev): v4.0.6 酒厂账单与订单完全比对 CI / verify (push) Has been cancelled Details	2026-08-31 17:28:09 +08:00
jacy	d555240295	merge(dev_jacy): v4.0.6 酒厂账单与订单完全比对 CI / verify (pull_request) Has been cancelled Details	2026-08-31 17:28:00 +08:00
jacy	4b9ab79acb	merge(dev): v4.0.4 开发任务/合伙人删除/账单合伙人列 CI / verify (push) Has been cancelled Details	2026-08-31 16:09:20 +08:00
jacy	d9725b1914	merge(dev_jacy): v4.0.4 开发任务/合伙人删除/账单合伙人列 CI / verify (pull_request) Has been cancelled Details	2026-08-31 16:09:09 +08:00
jacy	874ae93a9b	Merge pull request 'v4.0.3版本' (#55 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/55	2026-08-31 14:27:47 +08:00
jacy	fbb92e00d5	Merge pull request 'v4.0.3版本' (#54 ) from dev_jacy into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/54	2026-08-31 14:27:26 +08:00
jacy	bb831f0580	merge(dev_jacy): v4.0.2 活动图模板与合伙人选择持久化 CI / verify (push) Has been cancelled Details	2026-08-30 21:37:04 +08:00
jacy	fb66258b6a	merge(dev_jacy): 门店账单确认打款支持上传凭证照片 CI / verify (push) Has been cancelled Details	2026-08-30 15:26:32 +08:00
jacy	58010feed8	Merge branch 'main' of git.yqidian.com:jacy/dukang into dev CI / verify (push) Has been cancelled Details	2026-08-30 14:40:56 +08:00
jacy	9f14c59f22	merge(dev_jacy): v4.0.1 partner assoc and H5 user management	2026-08-30 14:35:56 +08:00
jacy	870494563d	merge(dev): store bill issue date to today CI / verify (push) Has been cancelled Details	2026-08-28 14:14:39 +08:00
jacy	4c9b3f72bc	merge(dev_jacy): store bill issue date to today	2026-08-28 14:13:28 +08:00
jacy	14c5c8c3f3	merge(dev): v3.5.18 HQ 明文手机、任务版本与核销快链 CI / verify (push) Has been cancelled Details	2026-08-28 13:58:57 +08:00
jacy	a7f3283ae5	merge(dev_jacy): v3.5.18 HQ 明文手机、任务版本与核销快链	2026-08-28 13:58:37 +08:00
jacy	c06251f0a4	merge(dev): HQ 订单筛选改版与用户商品模糊搜索 CI / verify (push) Has been cancelled Details	2026-08-28 13:12:52 +08:00
jacy	faa1830bde	merge(dev_jacy): HQ 订单筛选改版与用户商品模糊搜索	2026-08-28 13:11:17 +08:00
jacy	2b5f42acdf	merge(dev): HQ 推广码订单只计已完成并补快链 CI / verify (push) Has been cancelled Details	2026-08-28 12:57:03 +08:00
jacy	71149044ca	merge(dev_jacy): HQ 推广码订单只计已完成并补快链	2026-08-28 12:56:02 +08:00
jacy	1ecc6a11df	merge(dev): 企微结算账单明细与成交播报用户明文 CI / verify (push) Has been cancelled Details	2026-08-27 11:46:12 +08:00
jacy	cfd42dfc32	merge(dev_jacy): 企微结算账单明细与成交播报用户明文	2026-08-27 11:45:59 +08:00
jacy	a423fb71e8	merge(dev): v3.5.14 提交订单/支付成功日志端修复 CI / verify (push) Has been cancelled Details	2026-08-26 17:25:25 +08:00
jacy	4111e5c0a6	merge(dev_jacy): v3.5.14 提交订单/支付成功日志端修复	2026-08-26 17:25:15 +08:00
jacy	3a9f27eb38	merge(dev): v3.5.12 大屏BGM、中文展示、分类删除与侧栏 CI / verify (push) Has been cancelled Details	2026-08-26 10:55:40 +08:00
jacy	e2f5aa9dd8	merge(dev_jacy): v3.5.12 大屏BGM、中文展示、分类删除与侧栏	2026-08-26 10:55:14 +08:00
jacy	6a5c0cb090	Merge pull request 'Dev' (#53 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/53	2026-08-26 09:56:50 +08:00
jacy	448b9983d3	Merge pull request 'Dev jacy v3.5.11 企业微信通知调整' (#52 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/52	2026-08-26 09:56:36 +08:00
jacy	00bb6a2227	Merge pull request 'Dev' (#51 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/51	2026-08-26 07:16:04 +08:00
jacy	1f06530894	Merge pull request '小程序版本号' (#50 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/50	2026-08-26 07:15:52 +08:00
jacy	93390ccf75	merge(dev): 同城运费路由与配送单信息 CI / verify (push) Has been cancelled Details	2026-08-25 21:13:05 +08:00
jacy	a2976cdc8f	merge(dev_jacy): 同城运费路由与配送单信息	2026-08-25 21:12:53 +08:00
jacy	8f2ebbfef4	merge(dev): 补承运商删除操作常量 CI / verify (push) Has been cancelled Details	2026-08-25 14:32:32 +08:00
jacy	ee1a3f4b6c	merge(dev_jacy): 补承运商删除操作常量	2026-08-25 14:32:27 +08:00
jacy	f2fbf95c53	merge(dev): v3.5.10 同城配送提示与企微客服 CI / verify (push) Has been cancelled Details	2026-08-25 14:30:43 +08:00
jacy	98d52ff173	merge(dev_jacy): v3.5.10 同城配送提示与企微客服	2026-08-25 14:30:10 +08:00
jacy	43de361e61	merge(dev): 列设置靠右与订单状态多选 CI / verify (push) Has been cancelled Details	2026-08-25 14:20:39 +08:00
jacy	b1511ecb92	merge(dev_jacy): 列设置靠右与订单状态多选	2026-08-25 14:20:13 +08:00
jacy	0b548a2764	Merge pull request 'Dev' (#49 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/49	2026-08-25 12:39:52 +08:00
jacy	30f8d649cb	Merge pull request 'v3.5.9版本迭代列表优化' (#48 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/48	2026-08-25 12:39:30 +08:00
jacy	40e8a12596	Merge pull request 'Dev' (#47 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/47	2026-08-25 10:10:20 +08:00
jacy	d7241d54b1	Merge pull request '给用户增加“备注”列' (#46 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/46	2026-08-25 10:10:07 +08:00
jacy	3d819dc10b	Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#45 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/45	2026-08-25 09:23:12 +08:00
jacy	5e0691ab35	Merge pull request 'Dev jacy v3.5.8 和 v3.5.9 版本更新' (#44 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/44	2026-08-25 09:22:48 +08:00
jacy	8984465893	Merge pull request 'Dev' (#43 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/43	2026-08-23 19:27:28 +08:00
jacy	b90a4e9f8f	Merge pull request 'v3.5.7版本迭代' (#42 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/42	2026-08-23 19:27:14 +08:00
jacy	3f208d27a9	Merge pull request 'Dev' (#41 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/41	2026-08-23 17:34:40 +08:00
jacy	6973e3d7f5	Merge pull request '修改订单导出时间错误' (#40 ) from dev_jacy into dev CI / verify (pull_request) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/40	2026-08-23 17:34:21 +08:00
jacy	fa69ced448	Merge pull request 'Dev v3.5.6' (#39 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/39	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) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38	2026-08-23 16:43:07 +08:00
jacy	18c5abea79	Merge pull request 'v3.5.5版本合并' (#37 ) from dev into main CI / verify (push) Has been cancelled Details 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) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36	2026-08-23 12:29:33 +08:00
jacy	5d4ed566de	merge(dev): HQ product list as SPU with expandable SKUs CI / verify (push) Has been cancelled Details	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	5fdddae41c	merge(dev): v3.5.4 规格主图与门店使用规则 CI / verify (push) Has been cancelled Details	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	22c0b03a47	Merge pull request 'Dev' (#35 ) from dev into main CI / verify (push) Has been cancelled Details 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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/34	2026-08-21 16:23:54 +08:00
jacy	f2d03e2595	Merge pull request 'v3.5.4' (#33 ) from dev into main CI / verify (push) Has been cancelled Details 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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/32	2026-08-21 15:50:07 +08:00
jacy	0c28c204b2	Merge pull request 'Dev' (#31 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/31	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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/30	2026-08-20 20:23:03 +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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/28	2026-08-20 18:55:18 +08:00
jacy	f941dcf072	Merge pull request 'Dev' (#27 ) from dev into main CI / verify (push) Has been cancelled Details 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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/26	2026-08-20 15:06:07 +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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/24	2026-08-20 13:43:06 +08:00
jacy	9b8e3f1347	Merge pull request 'v3.5.2 大屏调整' (#23 ) from dev into main CI / verify (push) Has been cancelled Details 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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/22	2026-08-20 12:00:57 +08:00
jacy	1440a59fc8	Merge pull request 'Dev' (#21 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/21	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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/20	2026-08-20 00:54:17 +08:00
jacy	11659484c6	Merge pull request 'v3.5.1 版本更新' (#19 ) from dev into main CI / verify (push) Has been cancelled Details 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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/18	2026-08-19 16:00:56 +08:00
jacy	0fb7ab7abb	Merge pull request 'v3.4.18' (#17 ) from dev into main CI / verify (push) Has been cancelled Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/17	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 Details Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/16	2026-08-17 23:45:00 +08:00