songchuang
|
4b2543ffda
|
Merge branch 'songchuang' into dev
|
2023-04-17 09:40:16 +08:00 |
|
songchuang
|
2b9e317444
|
对账单后台管理部分代码提交
|
2023-04-17 09:35:03 +08:00 |
|
|
|
9065d631ce
|
Merge branch 'xjjdev' into dev
|
2023-04-14 13:58:02 +08:00 |
|
|
|
8beb8f6566
|
通过画作数量统计改为 统计画家通过基本画作审批的画作数量
|
2023-04-14 13:49:25 +08:00 |
|
|
|
7f8760a7eb
|
修改注释
|
2023-04-13 14:16:16 +08:00 |
|
|
|
a05a7f9153
|
更新注释
|
2023-04-13 14:15:30 +08:00 |
|
|
|
26e073f936
|
Merge branch 'xjjdev' into dev
|
2023-04-13 14:14:28 +08:00 |
|
|
|
5fe484ee49
|
修复特定情况下会重复创建邀请关系的问题
|
2023-04-13 14:14:11 +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
|
929304e80d
|
Merge branch 'songchuang' into dev
|
2023-04-11 12:33:53 +08:00 |
|
songchuang
|
9916e16d54
|
contract pb
|
2023-04-11 12:32:45 +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 |
|
songchuang
|
6af2d992aa
|
Merge branch 'songchuang' into dev
|
2023-04-07 13:41:48 +08:00 |
|
|
|
3d08ba4ee2
|
环境变量测试3
|
2023-04-07 11:42:27 +08:00 |
|
|
|
4cba6ffd8c
|
环境变量测试2
|
2023-04-07 10:41:32 +08:00 |
|
|
|
8f7618b8bd
|
环境变量测试2
|
2023-04-07 10:33:48 +08:00 |
|
|
|
338439db59
|
环境变量测试
|
2023-04-07 10:20:05 +08:00 |
|
|
|
458c5e3bc8
|
修改dockerfile测试
|
2023-04-07 10:08:49 +08:00 |
|
|
|
1d9f336db3
|
Merge branch 'xjjdev'
|
2023-04-07 09:48:45 +08:00 |
|
|
|
36e39bf089
|
Merge branch 'xjjdev' into dev
|
2023-04-07 09:48:33 +08:00 |
|
|
|
247541fb24
|
删除不必要的数据表
|
2023-04-07 09:48:25 +08:00 |
|
|
|
04bd03022d
|
Merge branch 'xjjdev' into dev
|
2023-04-07 08:08:34 +08:00 |
|
|
|
5506727220
|
注释掉初始化时不需要的表
|
2023-04-07 08:08:08 +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 |
|
