merge_ty #16

Merged

tianyu merged 28 commits from merge_ty into master 2023-06-08 18:04:20 +08:00

Conversation 0 Commits 28 Files Changed 14

tianyu commented 2023-06-08 18:04:04 +08:00

Collaborator

There is no content yet.

tianyu added 28 commits 2023-06-08 18:04:05 +08:00

346e4036fd feat: 运行环境区分

1c9287d2da Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

a9284a9842 fix: 修复测试环境变量

0b32343112 配置文件

9b0f586317 feat: 新增推广员注册功能

903d23b2f6 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test

34ef8b1ed8 修改支付回调

ef6684b366 Merge remote-tracking branch 'origin/test' into test

8b773d5366 查询链接地址

dac91acc10 fix: 微信公众号APPID区分运行环境

c60367ffc0 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test

1692521b77 fix: 修复无法跳转到注册推广员页面问题

0ff7ebece8 fix: 修改推广员 新增一个注册来源

a0028953bd Merge branch 'feature/mall_product' into test

4529afd72c Merge remote-tracking branch 'origin/test' into test

acbce105f1 fix: 修改推广员 新增一个注册来源

cedb9985ad Merge branch 'feature/mall_product' into test

c3b0862735 管理端推广员新增注册来源筛选

46230f3bcb Merge remote-tracking branch 'origin/test'

ff0c287110 fix: 修复bug

14d89110a4 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test

c231870cad fix: 修改

424df4b278 Merge branch 'feature/mall_product' into test

956f0cc445 Merge remote-tracking branch 'origin/test' into test

e760a69ff9 fix: 修复bug

da123b99f5 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test

d67b6bd8a1 fix: 修复bug

98673dc012 Merge branch 'test' into merge_ty

tianyu merged commit 9a9b6dbe39 into master 2023-06-08 18:04:20 +08:00

tianyu deleted branch merge_ty 2023-06-08 18:04:20 +08:00

tianyu referenced this issue from a commit 2023-06-08 18:04:21 +08:00

Merge pull request 'merge_ty' (#16) from merge_ty into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: zenghuapei/cyywl_server#16

There is no content yet.