|
|
527339cd64
|
Merge branch 'xjjdev' into dev
|
2023-04-14 14:21:52 +08:00 |
|
|
|
48ce44476d
|
修改审批通过的画作数量查询条件
|
2023-04-14 14:21:45 +08:00 |
|
|
|
ec4cc9cf4a
|
Merge branch 'xjjdev' into dev
|
2023-04-13 10:27:03 +08:00 |
|
|
|
a3caa53b86
|
更新字段控制判断
|
2023-04-13 10:26:49 +08:00 |
|
|
|
31e16c8e0b
|
添加注释
|
2023-04-13 09:29:17 +08:00 |
|
|
|
ceb3631037
|
Merge branch 'xjjdev' into dev
|
2023-04-13 09:23:51 +08:00 |
|
|
|
af109513b6
|
基本画作审批列表查询条件优化
|
2023-04-13 09:23:46 +08:00 |
|
|
|
0b34600883
|
Merge branch 'xjjdev' into dev
|
2023-04-13 09:07:25 +08:00 |
|
|
|
a4584a9592
|
按需求修改基本画作待审核列表的查询条件
|
2023-04-13 09:07:14 +08:00 |
|
|
|
f612737d94
|
Merge branch 'xjjdev' into dev
|
2023-04-12 17:51:30 +08:00 |
|
|
|
9cb3a13532
|
画作新增字段是否入围国展
|
2023-04-12 17:51:11 +08:00 |
|
|
|
a8b5a734d1
|
Merge branch 'xjjdev' into dev
|
2023-04-12 10:08:03 +08:00 |
|
|
|
8b9d0cc18e
|
现要求暂存和锁定的画作都能进行审批和展示
|
2023-04-12 10:07:49 +08:00 |
|
|
|
dc57a3c4e9
|
Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev
|
2023-04-11 16:42:43 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
