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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
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 |
|
|
|
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 |
|
|
|
9b87d16011
|
修改视频补充列表的字段类型
|
2023-03-17 11:42:13 +08:00 |
|
|
|
93290429a2
|
完成未完成合同数量的统计
|
2023-03-17 10:46:56 +08:00 |
|
|
|
f53fcb6e29
|
与合同微服务进行联动
|
2023-03-17 10:32:22 +08:00 |
|
songchuang
|
e65b4197b3
|
contract 部分修改
|
2023-03-17 10:04:29 +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 |
|
|
|
2c95d31139
|
优化对账单生产者的架子
|
2023-03-16 18:09:51 +08:00 |
|
|
|
ce9ea30edc
|
搭好了对账单的架子
|
2023-03-16 18:05:17 +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 |
|
songchuang
|
c3584aad12
|
contract 配置文件修改
|
2023-03-15 11:36:29 +08:00 |
|
songchuang
|
209bbf0d71
|
Merge branch 'songchuang' into dev
|
2023-03-15 10:48:34 +08:00 |
|
songchuang
|
6aaef47513
|
合同部分代码修改
|
2023-03-15 10:43:20 +08:00 |
|
|
|
eeaa2caea0
|
邀请关系列表新增按照邀请人数倒序
|
2023-03-15 09:53:13 +08:00 |
|
|
|
943ccb7c5d
|
1. 开发邀请关系统计接口
2. 修复部分bug
|
2023-03-14 18:45:35 +08:00 |
|
|
|
5616470c14
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-03-14 15:32:28 +08:00 |
|
|
|
779f01a401
|
修复了接受邀请人员部分字段值为空的问题
|
2023-03-14 15:32:03 +08:00 |
|
|
|
82ad55838a
|
修改了邀请码相关的代码
|
2023-03-14 15:09:13 +08:00 |
|
songchuang
|
e21b47352d
|
Merge branch 'dev' of http://192.168.12.3:8090/bugmaker/fonchain-artistinfo into dev
|
2023-03-14 13:21:33 +08:00 |
|
songchuang
|
274a13dec1
|
contract代码上传
|
2023-03-14 13:19:20 +08:00 |
|
songchuang
|
37b80dee16
|
contract 部分代码提交
|
2023-03-14 10:35:56 +08:00 |
|
|
|
a5ebfae17e
|
接口逻辑优化
|
2023-03-13 16:48:49 +08:00 |
|
|
|
ace17e00c2
|
修复部分bug
|
2023-03-13 15:54:22 +08:00 |
|
|
|
399834b842
|
修复画家画作统计接口的逻辑问题
|
2023-03-13 15:10:54 +08:00 |
|
|
|
62052d1fd9
|
更新视图
|
2023-03-13 14:56:20 +08:00 |
|
|
|
3009a0cbd6
|
完成画家画作统计的接口
|
2023-03-13 14:24:11 +08:00 |
|
songchuang
|
019331c4a4
|
Merge branch 'xjjdev' into songchuang
|
2023-03-10 18:05:40 +08:00 |
|
songchuang
|
dec8716a93
|
合同代码提交
|
2023-03-10 17:58:13 +08:00 |
|
|
|
1a2dfb738e
|
修复部分bug
|
2023-03-10 17:27:10 +08:00 |
|
|
|
cd9f6547c0
|
修复部分bug
|
2023-03-10 09:29:48 +08:00 |
|
|
|
42002f61e7
|
修复部分问题
|
2023-03-09 15:42:03 +08:00 |
|
|
|
327bbb65ea
|
修复部分bug
|
2023-03-09 15:10:51 +08:00 |
|
|
|
f030143625
|
修改pb文件
|
2023-03-08 17:46:17 +08:00 |
|
|
|
3e23d068b8
|
根据pb文件调整接口参数
|
2023-03-08 15:26:38 +08:00 |
|
|
|
a13c06cf4b
|
修改配置文件
|
2023-03-07 14:00:44 +08:00 |
|
|
|
1e6edde67c
|
新增查询受邀请的人员列表
|
2023-03-07 11:00:11 +08:00 |
|
|
|
880aa567c0
|
新增邀请码不为空判断
|
2023-03-07 08:48:58 +08:00 |
|
|
|
de8b3e250b
|
新增未完成数量统计
|
2023-03-06 18:24:33 +08:00 |
|
|
|
bd38fd6681
|
优化数据库迁移
|
2023-03-06 10:58:27 +08:00 |
|
songchuang
|
e9802ee14e
|
songchuang 分支代码上传
|
2023-03-03 16:24:19 +08:00 |
|
songchuang
|
4d45a4c4cc
|
songchuang 代码提交
|
2023-03-03 16:18:00 +08:00 |
|
|
|
c828806dc6
|
新增详情
|
2023-03-03 15:28:55 +08:00 |
|
|
|
c55f561344
|
修复默认状态的bug
|
2023-03-03 13:59:36 +08:00 |
|
|
|
d30d4b2513
|
更新画家补充信息相关接口
|
2023-03-03 13:47:45 +08:00 |
|
|
|
951791ea9a
|
完成画家指数相关接口
|
2023-03-03 09:12:26 +08:00 |
|
|
|
af0bdc6ea9
|
优化画展视频相关接口
|
2023-03-02 17:22:10 +08:00 |
|
|
|
db21400118
|
完成画展视频相关的基础接口
|
2023-03-02 13:32:45 +08:00 |
|
|
|
dfadc8446d
|
feat： 新增@画作@审批@流程@的@部分接口
|
2023-03-01 23:07:00 +08:00 |
|
|
|
c6a579fabf
|
修复了画作审批流程中的部分问题
|
2023-03-01 16:24:26 +08:00 |
|
|
|
f127a04599
|
做了部分优化
|
2023-03-01 09:06:02 +08:00 |
|
|
|
b88c957a78
|
新增画作可编辑状态检测
|
2023-03-01 08:34:45 +08:00 |
|
|
|
c8c093654d
|
更新接口
|
2023-02-28 23:27:00 +08:00 |
|
|
|
ee087e77f8
|
为画作的返回数据增加 创建、更新、删除字段
|
2023-02-28 08:30:33 +08:00 |
|
|
|
9cc419c041
|
完成艺术家查询接口
|
2023-02-27 15:51:04 +08:00 |
|
|
|
35b6166f04
|
更新接口
|
2023-02-26 19:59:43 +08:00 |
|
|
|
397313b04f
|
完成画作锁定状态历史记录查询功能
|
2023-02-26 19:57:42 +08:00 |
|
|
|
1534356077
|
修改查询条件
|
2023-02-25 12:02:07 +08:00 |
|
|
|
1fd2f10336
|
1. 完成画作的创建、更新、删除与画家锁定功能的联动
2. 修复部分bug
|
2023-02-25 11:07:51 +08:00 |
|
|
|
cbaa5e124a
|
完成画作锁定记录的相关接口
|
2023-02-25 08:44:50 +08:00 |
|
|
|
263bba1515
|
备份
|
2023-02-25 00:30:57 +08:00 |
|
|
|
51425ada2f
|
修改配置
|
2023-02-24 10:51:35 +08:00 |
|
|
|
c35d8a4b63
|
新增两个接口
|
2023-02-23 21:45:59 +08:00 |
|
|
|
48fe35705e
|
艺术家绑定同时绑定uid和id
|
2023-02-22 22:13:50 +08:00 |
|
|
|
7290f7448a
|
更新用户新增更新证件信息
|
2023-02-22 14:15:34 +08:00 |
|
|
|
e58f1e09bc
|
添加艺术家信息暂存接口
|
2023-02-22 13:37:50 +08:00 |
|
|
|
baa02b7b00
|
更新porto文件中的返回值
|
2023-02-21 13:06:43 +08:00 |
|
|
|
41ebd260b9
|
新增字段
|
2023-02-21 13:02:10 +08:00 |
|
