jiaji.H
|
94f156981c
|
Merge branch 'feat-hjj-pkManage#A116' into dev
|
2025-09-15 15:10:21 +08:00 |
|
jiaji.H
|
197750debe
|
Updata:更新pb文件
|
2025-09-15 15:10:10 +08:00 |
|
jiaji.H
|
06b1c37e30
|
Updata:更新pb文件
|
2025-09-15 14:57:35 +08:00 |
|
jiaji.H
|
6a0884afe7
|
Updata:更新pb文件
|
2025-09-15 14:37:35 +08:00 |
|
jiaji.H
|
17a017616e
|
Merge branch 'feat-hjj-pkManage#A116' into dev
|
2025-09-11 15:34:23 +08:00 |
|
jiaji.H
|
69beb2ad08
|
Updata:更新pb文件
|
2025-09-11 15:34:14 +08:00 |
|
jiaji.H
|
11c8d62e5e
|
Updata:更新pb文件
|
2025-09-11 15:01:09 +08:00 |
|
|
ef6d40cf81
|
单价模式增加总价
|
2025-09-11 14:50:42 +08:00 |
|
jiaji.H
|
93abf25796
|
feat:解决冲突
|
2025-09-09 11:05:56 +08:00 |
|
jiaji.H
|
166fe65169
|
Updata:更新pb文件
|
2025-09-09 11:04:50 +08:00 |
|
jiaji.H
|
0cb5d6e9ef
|
feat:解决冲突
|
2025-09-04 11:43:50 +08:00 |
|
jiaji.H
|
03a1370738
|
Updata:更新pb文件
|
2025-09-04 11:34:40 +08:00 |
|
|
7af0704d49
|
Merge branch 'feat-cjy-taskBench' into dev
|
2025-09-03 16:26:02 +08:00 |
|
|
e1da6bd563
|
feat: 任务管理台功能
新增任务管理台功能
|
2025-09-03 15:52:30 +08:00 |
|
jiaji.H
|
78f8f9c927
|
Updata:更新pb文件
|
2025-09-03 15:22:18 +08:00 |
|
jiaji.H
|
9e77c3133a
|
Updata:更新pb文件
|
2025-09-03 11:33:54 +08:00 |
|
|
41e28c9aed
|
Merge branch 'jng'
|
2025-08-27 13:59:21 +08:00 |
|
|
a264630b2c
|
Merge branch 'jng' into dev
|
2025-08-27 10:23:59 +08:00 |
|
|
e2962353b9
|
更新
|
2025-08-27 10:23:47 +08:00 |
|
|
c20e90d45a
|
导入数据脚本
|
2025-08-11 13:29:49 +08:00 |
|
|
11592d8c90
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-08-07 11:59:37 +08:00 |
|
|
25eed16be5
|
添加source
|
2025-08-07 11:59:25 +08:00 |
|
|
2846cdc1b2
|
Merge branch 'jng' into dev
|
2025-07-16 17:54:38 +08:00 |
|
|
130bb26ebf
|
修改
|
2025-07-16 17:54:15 +08:00 |
|
|
fa468e0130
|
修改
|
2025-07-08 16:21:06 +08:00 |
|
|
b33a776f93
|
解决冲突
|
2025-07-08 16:14:17 +08:00 |
|
|
54326ebe01
|
对账单添加手续费
|
2025-07-08 16:13:30 +08:00 |
|
|
9c6f1ae832
|
fix: 处理pb
|
2025-07-08 15:22:58 +08:00 |
|
|
80e45457ec
|
Merge branch 'feat-zjy-issue-013' into main
# Conflicts:
# api/bundle/bundle.pb.go
|
2025-07-08 15:21:49 +08:00 |
|
|
fe6ac1be55
|
解决冲突
|
2025-07-08 14:20:38 +08:00 |
|
|
eba1083fe7
|
修改
|
2025-07-08 14:18:26 +08:00 |
|
|
82e5f92be2
|
解决冲突
|
2025-07-07 19:37:04 +08:00 |
|
|
493624dfcb
|
添加excel导入
|
2025-07-07 19:35:54 +08:00 |
|
|
9f03ac444e
|
合并数据
|
2025-07-07 15:34:00 +08:00 |
|
|
f6164cd455
|
fix: 提交支持自动创建用户和订单代码
|
2025-07-07 13:32:19 +08:00 |
|
|
7c2f3b5545
|
proto更新
|
2025-07-07 11:59:28 +08:00 |
|
|
dd25bb3f4e
|
Merge branch 'dev-lzh' into dev
|
2025-07-07 10:48:37 +08:00 |
|
|
cd9cd0dbd1
|
更新proto
|
2025-07-07 10:48:06 +08:00 |
|
|
f1bb8d54ca
|
Merge branch 'jng'
|
2025-07-03 16:12:17 +08:00 |
|
|
852d2fbed4
|
Merge branch 'jng' into dev
|
2025-07-03 15:51:15 +08:00 |
|
|
e7b3fe54bd
|
修改
|
2025-07-03 15:50:53 +08:00 |
|
|
db9edc057d
|
Merge branch 'jng'
|
2025-07-02 15:36:42 +08:00 |
|
|
db193ce55a
|
Merge branch 'jng' into dev
|
2025-07-02 14:02:33 +08:00 |
|
|
3e003ca581
|
修改
|
2025-07-02 14:02:10 +08:00 |
|
|
6848e73ac6
|
管理人是我
|
2025-06-27 17:19:22 +08:00 |
|
|
7ea988ccc5
|
解决冲突
|
2025-06-26 17:39:51 +08:00 |
|
|
7735b710dd
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:46 +08:00 |
|
|
9546978e3c
|
fix: 处理pb冲突
|
2025-06-26 17:10:01 +08:00 |
|
|
bbf093e104
|
Merge branch 'feat-zjy-issue-008' into main
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
# docs/dev/dubbogo.yaml
# pkg/router/bundle.go
# pkg/service/init.go
|
2025-06-26 17:07:16 +08:00 |
|
|
4af106da5d
|
Update bundle.validator.pb.go
|
2025-06-26 16:56:44 +08:00 |
|
|
2fc8ee5cb2
|
合并代码
|
2025-06-26 16:54:59 +08:00 |
|
|
62efe6a80d
|
短信通知
|
2025-06-26 09:19:18 +08:00 |
|
|
afcc29ba80
|
Merge branch 'jng' into dev
|
2025-06-25 16:31:32 +08:00 |
|
|
f583a771d6
|
修改
|
2025-06-25 16:30:34 +08:00 |
|
|
ada34794e3
|
解决冲突
|
2025-06-25 15:34:14 +08:00 |
|
|
23cf374c95
|
修改
|
2025-06-25 15:32:51 +08:00 |
|
|
ea89bdbe02
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 15:24:33 +08:00 |
|
|
b46286c584
|
更新proto
|
2025-06-25 15:23:55 +08:00 |
|
|
0a9d8f628d
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-25 11:09:30 +08:00 |
|
|
ce9deac980
|
1
|
2025-06-25 10:25:24 +08:00 |
|
|
f26492218b
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-24 18:28:17 +08:00 |
|
|
e0d7b3775c
|
添加作品数量
|
2025-06-24 18:27:55 +08:00 |
|
|
8f987dff52
|
Merge branch 'dev' of http://172.16.100.91:3000/fiee/fonchain-fiee into dev
|
2025-06-24 16:38:50 +08:00 |
|
|
0545372341
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-24 16:38:41 +08:00 |
|
|
b9ca6c67ef
|
添加取号
|
2025-06-24 16:38:26 +08:00 |
|
|
3890d74c0c
|
添加取号
|
2025-06-24 16:33:06 +08:00 |
|
|
ac18e084f3
|
Merge branch 'sxy' into dev
|
2025-06-24 16:05:03 +08:00 |
|
|
b5ec90382f
|
1
|
2025-06-24 16:01:50 +08:00 |
|
|
0d529d47db
|
修改套餐proto文件-1
|
2025-06-24 16:01:39 +08:00 |
|
|
b2133c6d90
|
解决冲突
|
2025-06-24 15:54:18 +08:00 |
|
|
44bff5db82
|
修改
|
2025-06-24 15:53:24 +08:00 |
|
|
cd726f2987
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 15:17:41 +08:00 |
|
|
a3703f1d52
|
更新proto文件
|
2025-06-24 15:17:10 +08:00 |
|
|
786347f0d5
|
修改
|
2025-06-24 14:38:34 +08:00 |
|
|
b46400d15c
|
Merge branch 'sxy' into dev
|
2025-06-24 14:26:53 +08:00 |
|
|
a30636b387
|
修改套餐proto文件
|
2025-06-24 14:26:13 +08:00 |
|
|
2b5dd8d977
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-24 13:56:56 +08:00 |
|
|
490b0d7787
|
添加合同删除
|
2025-06-24 13:56:22 +08:00 |
|
|
e48016fc4c
|
修改
|
2025-06-24 13:44:46 +08:00 |
|
|
a8f0107656
|
修改
|
2025-06-24 13:42:57 +08:00 |
|
|
08a12459e6
|
更新proto
|
2025-06-23 14:14:18 +08:00 |
|
|
c34cc285bb
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-20 16:42:04 +08:00 |
|
|
7588bf4b28
|
绑定
|
2025-06-20 16:41:24 +08:00 |
|
|
c0ff047f66
|
proto 更新
|
2025-06-20 16:28:21 +08:00 |
|
|
ae33bf910a
|
修改
|
2025-06-20 15:52:44 +08:00 |
|
|
a3f38b8377
|
修改
|
2025-06-20 15:51:16 +08:00 |
|
|
42522327a5
|
1
|
2025-06-20 11:46:06 +08:00 |
|
|
c20c6871c9
|
fix: 处理冲突,增加自行购买
|
2025-06-20 11:26:16 +08:00 |
|
|
383f8bef10
|
Merge branch 'jng' into feat-zjy-issue-008
# Conflicts:
# api/bundle/bundle.pb.go
# api/bundle/bundle_triple.pb.go
|
2025-06-20 11:21:22 +08:00 |
|
|
139901467f
|
Merge branch 'dev-lzh' into dev
|
2025-06-20 09:44:39 +08:00 |
|
|
320e110f8c
|
补充缺失字段
|
2025-06-20 09:44:03 +08:00 |
|
|
736e3b1bd0
|
修改H5套餐列表
|
2025-06-19 16:19:37 +08:00 |
|
|
9f7f818e79
|
修改
|
2025-06-19 16:05:12 +08:00 |
|
|
60498f8af9
|
解决冲突
|
2025-06-19 15:34:17 +08:00 |
|
|
8cfcbf345e
|
修改
|
2025-06-19 15:32:54 +08:00 |
|
|
dff14a45be
|
更新proto文件
|
2025-06-19 15:12:32 +08:00 |
|
|
f3882fd709
|
更新proto
|
2025-06-19 15:11:05 +08:00 |
|
|
2facb5c0fb
|
Merge branch 'chat'
|
2025-06-19 15:07:05 +08:00 |
|
|
686a57ebc5
|
更新proto文件
|
2025-06-19 15:06:01 +08:00 |
|
|
9e1080659a
|
Merge branch 'feature-multicast-daiyb' into dev
|
2025-06-19 11:05:21 +08:00 |
|