|
|
aa7edf420d
|
Merge branch 'xjjdev' into dev
|
2023-04-06 14:50:26 +08:00 |
|
|
|
e476abd2d3
|
解锁用户增加判断，没修改数据不让解锁
|
2023-04-06 14:49:54 +08:00 |
|
|
|
00e3401985
|
完善对账单
|
2023-04-04 09:37:00 +08:00 |
|
|
|
45f193589b
|
Merge branch 'xjjdev' into dev
|
2023-04-04 08:48:13 +08:00 |
|
|
|
ce5ae4cdc2
|
Merge branch 'xjjdev'
|
2023-04-03 14:56:00 +08:00 |
|
|
|
87875ba6d0
|
修复用户查询接口只查询画家的问题
|
2023-04-03 14:55:41 +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 |
|
|
|
195f3877b8
|
Merge branch 'xjjdev' into dev
|
2023-03-31 09:28:12 +08:00 |
|
|
|
518315ecb7
|
Merge branch 'xjjdev'
|
2023-03-30 14:52:34 +08:00 |
|
|
|
69a4b2cefe
|
优化生成画展视频接口
|
2023-03-30 14:52:22 +08:00 |
|
|
|
e13ea02eae
|
Merge branch 'xjjdev'
|
2023-03-30 11:22:42 +08:00 |
|
|
|
76bd876381
|
修改邀请列表查询的字段
|
2023-03-30 11:22:31 +08:00 |
|
|
|
70da4204c4
|
Merge branch 'xjjdev'
|
2023-03-30 11:14:47 +08:00 |
|
|
|
b322fbb8f2
|
修改邀请统计的主表为invite
|
2023-03-30 11:14:21 +08:00 |
|
|
|
abad805a5e
|
Merge branch 'xjjdev'
|
2023-03-30 11:06:11 +08:00 |
|
|
|
8823cf4e9c
|
修改邀请列表的查询表为invite
|
2023-03-30 11:06:01 +08:00 |
|
|
|
c2cbc5dfe0
|
Merge branch 'xjjdev'
|
2023-03-29 23:39:25 +08:00 |
|
|
|
8f8a8208b9
|
更新pb文件
|
2023-03-29 23:39:04 +08:00 |
|
|
|
129332ce1d
|
Merge branch 'xjjdev'
|
2023-03-29 23:08:49 +08:00 |
|
|
|
219528bbab
|
Merge branch 'xjjdev' into dev
|
2023-03-29 23:08:34 +08:00 |
|
|
|
0af56855e0
|
修复字段取值错误的问题
|
2023-03-29 23:02:27 +08:00 |
|
songchuang
|
3816a5bbb7
|
Merge branch 'songchuang' into dev
|
2023-03-28 17:13:40 +08:00 |
|
songchuang
|
f898e79632
|
contract 接口修改
|
2023-03-28 17:11:39 +08:00 |
|
songchuang
|
a7be810101
|
Merge branch 'songchuang' into dev
|
2023-03-28 15:44:36 +08:00 |
|
songchuang
|
ab1e64b6e4
|
contract 增加ContractHistoryByLockMgmt接口
|
2023-03-28 15:42:30 +08:00 |
|
|
|
6b5cf6dfe7
|
Merge branch 'xjjdev' into dev
|
2023-03-28 15:37:07 +08:00 |
|
|
|
a7bdbf39a1
|
优化url字段长度
|
2023-03-28 14:01:26 +08:00 |
|
|
|
4dd5ff48da
|
优化视频补充信息查询条件
|
2023-03-28 13:51:44 +08:00 |
|
|
|
bc0f15f77e
|
新增画作预览列表的筛选条件
|
2023-03-28 13:38:07 +08:00 |
|
|
|
2d9f9dbb95
|
修复大小写不敏感导致的统计问题
|
2023-03-24 18:19:17 +08:00 |
|
|
|
1b274a0fce
|
修复mysql大小写不敏感导致的数据统计问题
|
2023-03-24 18:18:10 +08:00 |
|
|
|
793a436630
|
Merge branch 'xjjdev' into dev
|
2023-03-24 14:41:14 +08:00 |
|
|
|
418e22df64
|
修复orm查询方法
|
2023-03-24 14:40:43 +08:00 |
|
|
|
6c1c84c365
|
修复字段类型错误的问题
|
2023-03-24 14:39:22 +08:00 |
|
songchuang
|
deaeee5c16
|
Merge branch 'songchuang' into dev
|
2023-03-24 14:13:34 +08:00 |
|
songchuang
|
ac0200e952
|
对账单代码提交
|
2023-03-24 14:11:43 +08:00 |
|
|
|
e19bc5bd12
|
增加调试信息
|
2023-03-24 13:28:34 +08:00 |
|
|
|
5475034aaa
|
Merge branch 'xjjdev' into dev
|
2023-03-24 13:10:01 +08:00 |
|
|
|
0459319c2a
|
为邀请关系增加筛选条件
|
2023-03-24 13:09:17 +08:00 |
|
|
|
0b794fa6a0
|
Merge branch 'xjjdev' into dev
|
2023-03-24 12:54:29 +08:00 |
|
|
|
9f710b4158
|
新增调试信息
|
2023-03-24 12:54:03 +08:00 |
|
|
|
54e27c2cf9
|
Merge branch 'xjjdev' into dev
|
2023-03-24 12:23:24 +08:00 |
|
|
|
3bf38f5f71
|
添加遗漏的筛选条件
|
2023-03-24 12:23:10 +08:00 |
|
|
|
f563dd4dd0
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-24 12:13:38 +08:00 |
|
|
|
556ba4bd9e
|
Merge branch 'xjjdev' into dev
|
2023-03-24 12:13:28 +08:00 |
|
songchuang
|
3afa12c1e9
|
StatementList 修改
|
2023-03-24 11:50:20 +08:00 |
|
|
|
4c810fe81f
|
添加遗漏的筛选条件
|
2023-03-24 11:49:09 +08:00 |
|
|
|
80f9266b6b
|
Merge branch 'xjjdev' into dev
|
2023-03-24 10:58:17 +08:00 |
|
|
|
e04e6ba2c8
|
修复bug
|
2023-03-24 10:58:03 +08:00 |
|
|
|
f7f1c9dd8c
|
Merge branch 'xjjdev' into dev
|
2023-03-24 10:50:35 +08:00 |
|
|
|
54df36de5e
|
修复使用邀请码查询邀请关系时，对邀请码大小写不敏感的问题
|
2023-03-24 10:50:21 +08:00 |
|
|
|
85a561f06c
|
Merge branch 'xjjdev' into dev
|
2023-03-24 10:10:35 +08:00 |
|
|
|
e54124e7c5
|
修改邀请关系的查询表
|
2023-03-24 10:09:21 +08:00 |
|
songchuang
|
690bc74f1d
|
物权表结构修改，修改部分物权代码
|
2023-03-24 09:41:11 +08:00 |
|
|
|
0ec920e08e
|
修改邀请码关系查询的数据表
|
2023-03-24 09:39:34 +08:00 |
|
|
|
8fec641ffd
|
修复部分错误
|
2023-03-23 19:40:47 +08:00 |
|
|
|
9d8012f1f2
|
用户查询新增关键字搜索
|
2023-03-23 19:35:03 +08:00 |
|
|
|
c81515d1d2
|
优化筛选条件
|
2023-03-23 19:19:47 +08:00 |
|
songchuang
|
e4e298d921
|
对账单增加接口
|
2023-03-23 17:17:29 +08:00 |
|
songchuang
|
00bb094a3c
|
Merge branch 'songchuang' into dev
|
2023-03-22 16:27:07 +08:00 |
|
songchuang
|
baa1bea012
|
对账单代码上传
|
2023-03-22 16:16:16 +08:00 |
|
|
|
6b0ca5c019
|
更新用户信息新增账号id更新
|
2023-03-22 13:07:59 +08:00 |
|
|
|
d72727759a
|
解决冲突
|
2023-03-21 16:03:55 +08:00 |
|
|
|
65f6edf87f
|
修复字段定义错误的问题
|
2023-03-21 16:00:44 +08:00 |
|
|
|
7adf2cb8ba
|
修复报错
|
2023-03-21 15:54:03 +08:00 |
|
|
|
18d52d40a6
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-21 15:16:06 +08:00 |
|
|
|
c8696a969f
|
更新去重索引
|
2023-03-21 11:18:11 +08:00 |
|
songchuang
|
c40e13fa95
|
FinishContract 接口添加contractUid字段
|
2023-03-18 16:13:26 +08:00 |
|
songchuang
|
1d07fd3062
|
添加签署时间】
|
2023-03-18 10:59:34 +08:00 |
|
songchuang
|
99b0c00319
|
ContractList 状态值修改
|
2023-03-18 10:36:31 +08:00 |
|
|
|
30a3a02f21
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-18 09:42:40 +08:00 |
|
songchuang
|
2405afd6f7
|
contract 修改代码提交
|
2023-03-17 21:17:15 +08:00 |
|
|
|
3be63b5e83
|
Merge branch 'dev'
|
2023-03-17 19:12:10 +08:00 |
|
|
|
675e1b1aba
|
修改配置
|
2023-03-17 18:05:51 +08:00 |
|
songchuang
|
f36d9a5cfa
|
contract 代码修改
|
2023-03-17 17:36:09 +08:00 |
|
|
|
59808676b0
|
Merge branch 'xjjdev' into dev
|
2023-03-17 17:35:25 +08:00 |
|
|
|
d4a8f1cb34
|
修改了对账单pb文件中命名方式不正确的字段
|
2023-03-17 15:17:25 +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 |
|
|
|
487f284f1d
|
Merge branch 'xjjdev' into dev
|
2023-03-17 11:55:38 +08:00 |
|
|
|
93290429a2
|
完成未完成合同数量的统计
|
2023-03-17 10:46:56 +08:00 |
|
|
|
f53fcb6e29
|
与合同微服务进行联动
|
2023-03-17 10:32:22 +08:00 |
|
|
|
732b58cc28
|
删除注释
|
2023-03-17 08:52:27 +08:00 |
|
|
|
273c4513f0
|
修复创建合同报错的问题
|
2023-03-17 08:49:29 +08:00 |
|
|
|
b44b229b4e
|
同上
|
2023-03-16 18:17:12 +08:00 |
|
songchuang
|
68d53191fc
|
contract 部分代码修改
|
2023-03-16 16:05:35 +08:00 |
|
songchuang
|
4abf550246
|
contract 传入参数修改
|
2023-03-16 15:16:28 +08:00 |
|
|
|
c6475d50e1
|
更新会之前的邀请人查询方法
|
2023-03-16 13:21:17 +08:00 |
|
|
|
4e5d45685d
|
调用账号服务报错as/sk验证错误，换回原先的方法
|
2023-03-16 13:18:57 +08:00 |
|
|
|
5f13ac9a05
|
添加调试信息
|
2023-03-16 11:13:25 +08:00 |
|
|
|
c56783867f
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-15 18:08:44 +08:00 |
|
|
|
7d7d294541
|
更新pb文件
|
2023-03-15 18:08:37 +08:00 |
|
songchuang
|
3d803cd860
|
contract 后台部分代码修改
|
2023-03-15 18:06:21 +08:00 |
|
|
|
1d5e4dd994
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-15 15:31:25 +08:00 |
|
songchuang
|
1af745879c
|
contract 部分代码修改
|
2023-03-15 15:25:05 +08:00 |
|
|
|
29f6ee5a63
|
添加调试信息
|
2023-03-15 15:12:06 +08:00 |
|
|
|
5f7f7e35a3
|
修复邀请关系中遗漏的身份证号码字段
|
2023-03-15 15:01:04 +08:00 |
|
|
|
3ff4e235a4
|
邀请码字段类型错误导致的查询问题
|
2023-03-15 14:51:41 +08:00 |
|
|
|
8638fa1b7c
|
修复冲突
|
2023-03-15 14:26:14 +08:00 |
|
