Commit Graph

15 Commits

Author SHA1 Message Date
ziming 4b9c9b5652 Merge branch 'pro' into kx
# Conflicts:
#	api/v1/cmb_cpn.proto
#	internal/biz/alarm.go
#	internal/biz/order.go
#	internal/biz/query.go
#	internal/pkg/mq_http/mq_http_test.go
#	internal/server/wechat_consumer.go
#	internal/service/cmb.go
#	internal/service/order.go
2025-06-03 09:46:41 +08:00
ziming 84451f8aaa 代码调整 2025-05-28 20:40:53 +08:00
ziming 304dc56bb2 kx 2025-05-22 15:31:40 +08:00
李子铭 33d456b5d3 ctx 2025-03-24 14:12:11 +08:00
李子铭 73a23aef4a 去掉枷锁 2025-03-21 13:38:51 +08:00
李子铭 e511aae2d4 db fail 2025-03-20 16:17:13 +08:00
李子铭 8ec8f2a980 活动批次查询确认 2025-03-17 19:48:10 +08:00
李子铭 d5ffbbd7d6 拓展参数字段 2025-03-17 10:11:24 +08:00
李子铭 bd377b5b81 notice 2025-03-14 16:04:37 +08:00
李子铭 2ca8e988e7 notice 2025-03-14 11:39:09 +08:00
李子铭 4350b11ec6 cmb 2025-03-11 14:04:12 +08:00
李子铭 d551c83294 cmb 2025-03-05 17:29:27 +08:00
李子铭 1ee31eea6f cmb 2025-03-05 17:00:00 +08:00
李子铭 7b8c29f0f8 cmb 2025-03-04 11:41:30 +08:00
李子铭 0db44baa84 init 2025-03-03 14:49:28 +08:00