Commit Graph

955 Commits

Author SHA1 Message Date
cjy
da49041b5b update:更新pb 2026-02-05 20:28:47 +08:00
cjy
bb326bfe0d fix:更新也增加订单uuid 2026-02-05 20:24:00 +08:00
cjy
0bdf0f9648 feat:存入订单uuid
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 20:22:11 +08:00
cjy
4c4d139b05 fix:更新也增加订单uuid 2026-02-05 19:32:00 +08:00
f68e099d6e Merge branch 'feature-four-daiyb' into dev 2026-02-05 18:52:13 +08:00
1186336dd3 1 2026-02-05 18:52:02 +08:00
ca4a5772d2 Merge branch 'feature-four-daiyb' into dev 2026-02-05 18:07:59 +08:00
4b9bfc15a0 1 2026-02-05 18:07:54 +08:00
762fdd4b05 修改续费逻辑 2026-02-05 18:04:39 +08:00
6bc617ecc3 修改续费逻辑 2026-02-05 18:03:18 +08:00
cjy
d27b85a155 feat:存入订单uuid 2026-02-05 17:52:24 +08:00
cf2e4067b9 脚本更新 2026-02-05 17:07:51 +08:00
cf709742b2 脚本更新 2026-02-05 17:06:24 +08:00
9fb4b01590 批量查询 2026-02-05 16:23:44 +08:00
d0d5cd50a2 修改绑定订单 2026-02-05 15:38:48 +08:00
4c8789ed38 修改绑定订单 2026-02-05 15:38:12 +08:00
jiaji.H
bfd2dcd3cd Merge branch 'feat-hjj-OfficialManage#A161' 2026-02-05 14:56:53 +08:00
cjy
084df09c9b Merge branch 'feat-cjy-changeOperator' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-02-05 13:10:00 +08:00
cjy
35bc4a04c3 feat:更新pb文件 2026-02-05 11:25:58 +08:00
f59b434dc7 同步bundle的proto 2026-02-04 17:39:00 +08:00
e0ff2b542a Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-02-04 16:09:15 +08:00
3940e5f9eb Merge branch 'feature-four-daiyb' into dev 2026-02-04 16:09:14 +08:00
jiaji.H
63e772596c Merge branch 'feat-hjj-OfficialManage#A161' into dev 2026-02-04 14:47:27 +08:00
jiaji.H
4e37040f9e Updata:更新pb文件 2026-02-04 14:47:18 +08:00
jiaji.H
8962c73bfb Merge branch 'feat-hjj-OfficialManage#A161' into dev 2026-02-04 14:26:48 +08:00
jiaji.H
28f1a9326d Updata:更新pb文件 2026-02-04 14:26:37 +08:00
jiaji.H
cf4af5a71a Updata:更新pb文件 2026-02-04 14:19:58 +08:00
jiaji.H
531fddc629 Updata:解决冲突 2026-02-04 13:23:24 +08:00
jiaji.H
4a2263fba9 Updata:更新发票订单信息查询 2026-02-04 13:21:24 +08:00
e323325a57 fix: 调整创建订单的uuid 2026-02-04 12:21:24 +08:00
54b15344e0 fix: 调整创建订单的uuid 2026-02-04 12:13:27 +08:00
jiaji.H
3befb95827 Updata:更新pb文件 2026-02-04 11:17:48 +08:00
jiaji.H
62c8cb0fa1 Updata:解决冲突 2026-02-04 10:27:09 +08:00
jiaji.H
717ae05cc8 Updata:替换获取发票编号接口 2026-02-04 10:23:33 +08:00
cjy
5a89ad139f Merge branch 'feat-cjy-customerContract'
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle.validator.pb.go
#	api/bundle/bundle_triple.pb.go
2026-02-04 09:42:19 +08:00
5a814ab12f DM取消授权 2026-02-04 09:41:39 +08:00
JNG
62fa35b029 解决冲突 2026-02-03 16:49:17 +08:00
JNG
0802c372b0 修改 2026-02-03 16:46:57 +08:00
JNG
bb9c22e1aa Merge branch 'feature-four-daiyb' into jng 2026-02-03 16:24:16 +08:00
103fe91e8f Merge branch 'feature-four-daiyb' into dev 2026-02-03 16:21:25 +08:00
bbb09a08b2 修改接口 2026-02-03 16:21:13 +08:00
jiaji.H
a9201e794c Updata:解决冲突 2026-02-03 16:19:27 +08:00
7f0d61b229 1 2026-02-03 15:28:12 +08:00
JNG
1096dde762 Merge branch 'feature-four-daiyb' into jng 2026-02-03 10:23:22 +08:00
JNG
71420b3c1c 11 2026-02-03 10:19:33 +08:00
jiaji.H
3d7b70840a Updata:解决冲突 2026-02-02 20:03:11 +08:00
jiaji.H
1a069a7136 Updata:更新pb文件 2026-02-02 20:01:50 +08:00
jiaji.H
1b06517403 Updata:更新pb文件 2026-02-02 19:47:46 +08:00
jiaji.H
3cd8deb84b Updata:自动创建电子发票 2026-02-02 19:43:42 +08:00
jiaji.H
dbb8cd4615 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2026-02-02 16:39:54 +08:00
jiaji.H
e85de27321 Updata:更新pb文件 2026-02-02 16:39:49 +08:00
b62d412022 Merge branch 'main' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee 2026-02-02 16:13:42 +08:00
7373026f48 Merge branch 'feature-four-daiyb' 2026-02-02 16:13:01 +08:00
jiaji.H
101dc38ed8 Updata:解决冲突 2026-02-02 15:48:09 +08:00
jiaji.H
7dee667a97 Updata:增加导出数据验收类型 2026-02-02 15:42:16 +08:00
jiaji.H
a5dcdf2a75 Updata:更新pb文件 2026-02-02 15:29:00 +08:00
jiaji.H
47b103a8c4 Updata:更新pb文件 2026-02-02 15:27:40 +08:00
jiaji.H
0d54572111 Updata:解决冲突 2026-02-02 14:13:47 +08:00
jiaji.H
3f3344ee5b Updata:更新pb文件 2026-02-02 14:11:48 +08:00
jiaji.H
bc1ff822eb Updata:解决冲突 2026-02-02 13:43:20 +08:00
jiaji.H
4e97d3903b Updata:更新字段类型 2026-02-02 13:41:49 +08:00
jiaji.H
7391e4c845 Updata:解决冲突 2026-02-02 11:23:23 +08:00
jiaji.H
b64800aa49 Updata:更新pb文件 2026-02-02 11:15:44 +08:00
jiaji.H
5a8a75b8ed Updata:更新发票管理相关接口 2026-02-02 11:03:07 +08:00
cjy
e7f652371b fix:修复测试环境pb问题 2026-02-02 10:23:54 +08:00
cjy
61dbcd23ba fix: 修复pb文件
# Conflicts:
#	api/bundle/bundle.pb.go
#	api/bundle/bundle.validator.pb.go
#	api/bundle/bundle_triple.pb.go
2026-02-02 09:45:47 +08:00
bx1834938347-prog
9f3d4fab99 Merge branch 'wwq' into dev 2026-02-02 09:41:06 +08:00
bx1834938347-prog
46b9225298 feat:新增补发定时任务 2026-02-02 09:40:55 +08:00
jiaji.H
fdf6a967bf Updata:更新pb文件 2026-01-31 00:05:19 +08:00
c8c2202538 同步proto 2026-01-30 20:00:50 +08:00
JNG
2eb82a21cb 修改 2026-01-30 15:44:21 +08:00
JNG
2e6c77cf88 添加购买类型 2026-01-30 15:43:27 +08:00
cjy
e57c664ec0 feat: 增加推荐人列表接口 2026-01-30 15:42:25 +08:00
jiaji.H
ab6349d438 Updata:解决冲突 2026-01-30 15:20:54 +08:00
JNG
a5ffa3e8b5 Merge branch 'jng' 2026-01-30 14:07:46 +08:00
JNG
df0df7b652 Merge branch 'main' into jng 2026-01-30 13:51:10 +08:00
cjy
c02af4d3ae feat: 更新pb 2026-01-30 13:23:56 +08:00
jiaji.H
bc27434bed Updaya:增加导出接口 2026-01-30 12:42:47 +08:00
jiaji.H
c0d8c07a90 Updata:增加临时数据信息导出 2026-01-30 12:35:19 +08:00
cjy
254d85ced3 Merge branch 'feat-cjy-report'
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
#	api/cast/cast_triple.pb.go
#	pkg/service/cast/work.go
2026-01-30 12:01:23 +08:00
jiaji.H
8371c5944a Updata:增加发票相关接口 2026-01-30 11:39:46 +08:00
cjy
5bb04327d4 update: 更新pb 2026-01-30 10:06:14 +08:00
7c45999a40 Merge branch 'feature-four-daiyb' into dev 2026-01-29 11:42:23 +08:00
26658aaa5e 修改名称 2026-01-29 11:42:14 +08:00
2929e03eaf Merge branch 'feature-four-daiyb' into dev 2026-01-29 11:22:14 +08:00
dc0b639ae4 修改发布类型 2026-01-29 11:22:03 +08:00
4e69ab9731 Merge branch 'feature-four-daiyb' into dev 2026-01-29 11:16:38 +08:00
a67adf0013 更新账号返回状态 2026-01-29 11:16:27 +08:00
e4c88feaef Merge branch 'feature-four-daiyb' into dev 2026-01-27 14:36:25 +08:00
03c667b6de 修改重发参数 2026-01-27 14:36:09 +08:00
jiaji.H
abcd4609c7 Updata:解决冲突 2026-01-26 16:34:11 +08:00
28934436fe Update cast.pb.validate.go 2026-01-23 10:49:54 +08:00
c96bb04e55 Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev 2026-01-23 10:49:52 +08:00
c273a2650c Merge branch 'feature-four-daiyb' into dev 2026-01-23 10:49:24 +08:00
b6cc081b03 账号异常 2026-01-23 10:49:17 +08:00
JNG
fb2c5d0405 Merge branch 'jng' into dev 2026-01-22 16:04:55 +08:00
JNG
6381076912 11 2026-01-22 16:04:48 +08:00
JNG
7227f1b05e Merge branch 'jng' into dev 2026-01-22 15:57:36 +08:00
JNG
bd0722bd86 修改 2026-01-22 15:57:28 +08:00
cjy
eec3c75c75 Merge branch 'feat-cjy-report' into dev
# Conflicts:
#	api/cast/cast.pb.go
#	api/cast/cast.pb.validate.go
2026-01-22 11:54:19 +08:00