|
|
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 |
|
|
|
9edb0eae0b
|
Merge branch 'xjjdev'
|
2023-03-30 15:46:33 +08:00 |
|
|
|
5c231b338b
|
修改唯一索引
|
2023-03-30 15:46:26 +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 |
|
|
|
b58bf0c5f8
|
Merge branch 'xjjdev' into dev
|
2023-03-29 11:53:46 +08:00 |
|
|
|
5ba05220d3
|
优化画家补充信息字段长度
|
2023-03-29 11:03:55 +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 |
|
|
|
5d3faa442c
|
Merge branch 'xjjdev' into dev
|
2023-03-27 11:14:23 +08:00 |
|
|
|
75f292ee01
|
修复分页统计问题
|
2023-03-27 10:08:24 +08:00 |
|
|
|
65847688d6
|
修复分页统计问题
|
2023-03-27 10:07:41 +08:00 |
|
|
|
02930a50be
|
修复画家查询时total值错误的问题
|
2023-03-27 10:02:30 +08:00 |
|
|
|
e29f86fa8c
|
修复分页值返回错误的问题
|
2023-03-27 09:52:16 +08:00 |
|
|
|
2d9f9dbb95
|
修复大小写不敏感导致的统计问题
|
2023-03-24 18:19:17 +08:00 |
|
|
|
1b274a0fce
|
修复mysql大小写不敏感导致的数据统计问题
|
2023-03-24 18:18:10 +08:00 |
|
|
|
2a82776897
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-24 14:41:27 +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
|
669d28fa14
|
app.go 增加对账单部分代码
|
2023-03-24 14:36:45 +08:00 |
|
songchuang
|
c9721a18a1
|
Merge branch 'songchuang' into dev
|
2023-03-24 14:23:29 +08:00 |
|
songchuang
|
e3bd6c9076
|
init.go 添加自动生成对账单表
|
2023-03-24 14:19:56 +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 |
|
|
|
62b33d09bb
|
优化筛选条件
|
2023-03-24 12:13:09 +08:00 |
|
songchuang
|
3afa12c1e9
|
StatementList 修改
|
2023-03-24 11:50:20 +08:00 |
|
|
|
4c810fe81f
|
添加遗漏的筛选条件
|
2023-03-24 11:49:09 +08:00 |
|
songchuang
|
5275280910
|
Merge branch 'songchuang' into dev
|
2023-03-24 10:59:41 +08:00 |
|
songchuang
|
087ca51e06
|
contract 表 字段batchname改为batchtime
|
2023-03-24 10:58:37 +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
|
6b9870d3bd
|
对账单添加接口，原合同部分修改
|
2023-03-23 18:31:10 +08:00 |
|
songchuang
|
e4e298d921
|
对账单增加接口
|
2023-03-23 17:17:29 +08:00 |
|
songchuang
|
33c4db9cab
|
对账单表修改
|
2023-03-23 14:01:06 +08:00 |
|
songchuang
|
f5f466c04d
|
对账单表修改
|
2023-03-23 13:59:32 +08:00 |
|
songchuang
|
ea2953dd09
|
对账单表修改
|
2023-03-23 13:22:07 +08:00 |
|
songchuang
|
376674825b
|
对账单表修改
|
2023-03-23 11:52:18 +08:00 |
|
songchuang
|
1b5a52df12
|
Merge branch 'songchuang' into dev
|
2023-03-23 11:45:47 +08:00 |
|
songchuang
|
d70ee92564
|
对账单表修改
|
2023-03-23 11:42:51 +08:00 |
|
|
|
2aea6debbb
|
更细用户表去重索引
|
2023-03-23 11:01:49 +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 |
|
|
|
9fa3f65a44
|
用户表新增字段OldMgmtId
|
2023-03-21 15:15:40 +08:00 |
|
|
|
dfe218e1a0
|
实名表不需要手机号
|
2023-03-21 13:56:35 +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 |
|
|
|
cfc57aecba
|
修改生产环境配置
|
2023-03-17 17:34:49 +08:00 |
|
songchuang
|
c0bed7763d
|
Merge branch 'dev' of http://192.168.12.3:8090/bugmaker/fonchain-artistinfo into dev
|
2023-03-17 15:53:52 +08:00 |
|
songchuang
|
7e1e453ed1
|
a
|
2023-03-17 15:53:08 +08:00 |
|
|
|
7a364b9102
|
修改flow_status字段默认值
|
2023-03-17 15:21:11 +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 |
|
|
|
2c69951fc4
|
修改字段更新
|
2023-03-17 14:39:40 +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 |
|
|
|
487f284f1d
|
Merge branch 'xjjdev' into dev
|
2023-03-17 11:55:38 +08:00 |
|
