Commit Graph

91 Commits

Author SHA1 Message Date
songchuang
5d68278904 Merge branch 'dev' into jujin 2023-04-07 15:50:01 +08:00
aa7edf420d Merge branch 'xjjdev' into dev 2023-04-06 14:50:26 +08:00
e476abd2d3 解锁用户增加判断,没修改数据不让解锁 2023-04-06 14:49:54 +08:00
45f193589b Merge branch 'xjjdev' into dev 2023-04-04 08:48:13 +08:00
5850452d28 Merge branch 'main' of http://192.168.12.3:8090/bugmaker/fonchain-artistinfo into jujin 2023-04-03 14:07:48 +08:00
4aa11fff20 开发对账单模块 2023-04-03 14:07:37 +08:00
9fbc31fdd2 Merge branch 'xjjdev' 2023-03-31 14:08:57 +08:00
917b61de02 为数据库dsn增加时区 2023-03-31 14:08:44 +08:00
db6e137598 Merge branch 'xjjdev' 2023-03-31 13:52:59 +08:00
c3cdd52daa 修复受邀请人查询条件问题 2023-03-31 13:52:47 +08:00
c49275c1de Merge branch 'xjjdev' 2023-03-31 11:45:14 +08:00
143fde30e0 优化邀请关系处理逻辑 2023-03-31 11:45:06 +08:00
73264cde5d Merge branch 'xjjdev' 2023-03-31 11:42:58 +08:00
9315e15011 修复查询不到邀请人id的问题 2023-03-31 11:42:49 +08:00
519884feea Merge branch 'xjjdev' 2023-03-31 11:37:45 +08:00
f83b160745 添加调试信息 2023-03-31 11:37:34 +08:00
586e140d4f Merge branch 'xjjdev' 2023-03-31 11:35:13 +08:00
91bcc4843d 增加调试信息 2023-03-31 11:35:03 +08:00
ad7b9a21c9 Merge branch 'xjjdev' 2023-03-31 11:31:11 +08:00
fe0989ac14 更新 2023-03-31 11:31:03 +08:00
b6706dbf5c Merge branch 'xjjdev' 2023-03-31 11:19:07 +08:00
b4105ab312 更新邀请码绑定的判断逻辑 2023-03-31 11:18:56 +08:00
af16e16c03 Merge branch 'xjjdev' 2023-03-31 10:07:54 +08:00
7dabf560b9 增加调试信息 2023-03-31 10:07:39 +08:00
630c8f66ec Merge branch 'xjjdev' into dev 2023-03-31 09:41:03 +08:00
4161d4b498 Merge branch 'xjjdev' 2023-03-31 09:40:47 +08:00
13f0e73fa0 如果邀请码存在则刷新更新时间 2023-03-31 09:40:29 +08:00
195f3877b8 Merge branch 'xjjdev' into dev 2023-03-31 09:28:12 +08:00
ef12a59096 Merge branch 'xjjdev' 2023-03-31 09:28:01 +08:00
60495e4471 邀请关系记录增加用户id关联 2023-03-31 09:27:49 +08:00
8cc4a3fddd Merge branch 'xjjdev' 2023-03-30 14:38:29 +08:00
c3aff4f68e 优化更新证件信息的逻辑 2023-03-30 14:38:11 +08:00
246de253b2 Merge branch 'xjjdev' 2023-03-30 14:30:36 +08:00
17a1dd4648 优化更新身份证方法 2023-03-30 14:30:25 +08:00
songchuang
f898e79632 contract 接口修改 2023-03-28 17:11:39 +08:00
songchuang
ab1e64b6e4 contract 增加ContractHistoryByLockMgmt接口 2023-03-28 15:42:30 +08:00
songchuang
ac0200e952 对账单代码提交 2023-03-24 14:11:43 +08:00
songchuang
e4e298d921 对账单增加接口 2023-03-23 17:17:29 +08:00
songchuang
baa1bea012 对账单代码上传 2023-03-22 16:16:16 +08:00
3be63b5e83 Merge branch 'dev' 2023-03-17 19:12:10 +08:00
675e1b1aba 修改配置 2023-03-17 18:05:51 +08:00
5116b6aff8 Merge branch 'xjjdev' into dev 2023-03-17 14:40:07 +08:00
99d86de4e6 完成对账单的pb接口逻辑 2023-03-17 14:36:55 +08:00
a74381f56c Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev 2023-03-17 13:14:33 +08:00
songchuang
efc1f7015c 添加接口 2023-03-17 13:06:19 +08:00
2c95d31139 优化对账单生产者的架子 2023-03-16 18:09:51 +08:00
ce9ea30edc 搭好了对账单的架子 2023-03-16 18:05:17 +08:00
5f13ac9a05 添加调试信息 2023-03-16 11:13:25 +08:00
songchuang
c3584aad12 contract 配置文件修改 2023-03-15 11:36:29 +08:00
943ccb7c5d 1. 开发邀请关系统计接口
2. 修复部分bug
2023-03-14 18:45:35 +08:00