Commit Graph

173 Commits

Author SHA1 Message Date
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
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