|
|
3ee56b1433
|
Merge branch 'xjjdev' into dev
|
2023-04-11 16:42:38 +08:00 |
|
|
|
cdfbd81ed9
|
修复没有更新画家id的问题
|
2023-04-11 16:42:26 +08:00 |
|
songchuang
|
6d247aa4a4
|
GetContractList接口修改
|
2023-04-11 14:50:49 +08:00 |
|
songchuang
|
920cfef5eb
|
测试修改
|
2023-04-11 14:43:43 +08:00 |
|
songchuang
|
e7b8f40b50
|
contract列表代码修改
|
2023-04-11 12:30:23 +08:00 |
|
songchuang
|
e8baaf4e77
|
合同列表部分功能修改
|
2023-04-11 12:24:04 +08:00 |
|
songchuang
|
f70663a967
|
Merge branch 'jujin' into dev
|
2023-04-10 10:50:16 +08:00 |
|
|
|
4ea006f6f0
|
Merge branch 'xjjdev'
|
2023-04-09 13:42:44 +08:00 |
|
|
|
057422051a
|
更新错误提示
|
2023-04-09 12:33:08 +08:00 |
|
songchuang
|
be02805710
|
Merge branch 'jujin' of http://192.168.12.3:8090/bugmaker/fonchain-artistinfo into jujin
|
2023-04-07 15:51:23 +08:00 |
|
songchuang
|
5d68278904
|
Merge branch 'dev' into jujin
|
2023-04-07 15:50:01 +08:00 |
|
|
|
d7baf112ac
|
Merge branch 'xjjdev'
|
2023-04-07 14:28:53 +08:00 |
|
|
|
2d26f15400
|
Merge branch 'xjjdev' into dev
|
2023-04-07 14:27:16 +08:00 |
|
|
|
a7f8607d33
|
修复注册问题
|
2023-04-07 14:26:18 +08:00 |
|
|
|
bc23ba6090
|
Merge branch 'xjjdev'
|
2023-04-06 14:50:43 +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 |
|
|
|
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 |
|
|
|
77ddfb385a
|
Merge branch 'xjjdev'
|
2023-04-01 10:03:23 +08:00 |
|
|
|
1784209447
|
修改历史画作查询的方式
|
2023-04-01 10:03:15 +08:00 |
|
|
|
0847107720
|
Merge branch 'xjjdev'
|
2023-04-01 10:00:16 +08:00 |
|
|
|
2bbf591dbb
|
修复
|
2023-04-01 10:00:03 +08:00 |
|
|
|
b2844379fb
|
针对历史画作联动删除的问题，提供备用方案
|
2023-04-01 09:37:35 +08:00 |
|
|
|
1eba4ba5be
|
增加基本画作历史记录的统计方式
|
2023-04-01 09:35:47 +08:00 |
|
|
|
a186312aa3
|
Merge branch 'xjjdev'
|
2023-03-31 17:37:34 +08:00 |
|
|
|
6c34f89356
|
debug5
|
2023-03-31 17:35:27 +08:00 |
|
|
|
20ba130ac0
|
Merge branch 'xjjdev'
|
2023-03-31 17:04:46 +08:00 |
|
|
|
6e677c42d4
|
问题调试4
|
2023-03-31 17:04:32 +08:00 |
|
|
|
b1f8c17bfd
|
Merge branch 'xjjdev'
|
2023-03-31 17:00:27 +08:00 |
|
|
|
d00ddd30ee
|
问题调试3
|
2023-03-31 17:00:16 +08:00 |
|
|
|
ec1eba24cb
|
update
|
2023-03-31 16:59:23 +08:00 |
|
|
|
6103b55f95
|
Merge branch 'xjjdev'
|
2023-03-31 16:46:29 +08:00 |
|
|
|
874e8d31dc
|
问题调试
|
2023-03-31 16:46:22 +08:00 |
|
|
|
3ae240645d
|
Merge branch 'xjjdev'
|
2023-03-31 16:45:46 +08:00 |
|
|
|
24919d61c8
|
问题调试2
|
2023-03-31 16:45:33 +08:00 |
|
|
|
961c6dfbee
|
Merge branch 'xjjdev'
|
2023-03-31 16:36:43 +08:00 |
|
|
|
e570eee9b5
|
问题调试
|
2023-03-31 16:36:34 +08:00 |
|
|
|
82839afb83
|
Merge branch 'xjjdev'
|
2023-03-31 15:32:49 +08:00 |
|
|
|
f061ba6465
|
用户视图新增字段并更新pb文件
|
2023-03-31 15:31:41 +08:00 |
|
|
|
e4be385783
|
Merge branch 'xjjdev'
|
2023-03-31 15:21:45 +08:00 |
|
|
|
207cbc097f
|
修复用户视图会统计已删除数据的问题
|
2023-03-31 15:21:09 +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 |
|
|
|
518315ecb7
|
Merge branch 'xjjdev'
|
2023-03-30 14:52:34 +08:00 |
|
|
|
69a4b2cefe
|
优化生成画展视频接口
|
2023-03-30 14:52:22 +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 |
|
|
|
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 |
|
|
|
80ed1c86c5
|
Merge branch 'xjjdev' into dev
|
2023-03-29 23:17:02 +08:00 |
|
|
|
def89683a5
|
Merge branch 'xjjdev'
|
2023-03-29 23:16:54 +08:00 |
|
|
|
094a1d78b6
|
修复字段取值错误的问题
|
2023-03-29 23:16:39 +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 |
|
|
|
496e192765
|
修复分页传参错误的问题
|
2023-03-29 23:07:28 +08:00 |
|
|
|
01b8c6c6e2
|
修复字段取值错误的问题
|
2023-03-29 23:05:50 +08:00 |
|
|
|
0af56855e0
|
修复字段取值错误的问题
|
2023-03-29 23:02:27 +08:00 |
|
|
|
fc8b822a53
|
修复画家数据统计接口数据分页问题
|
2023-03-29 22:37:23 +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 |
|
