Commit Graph

117 Commits

Author SHA1 Message Date
songchuang
354394d518 对账单代码测试修改 2023-04-18 16:00:10 +08:00
3822d5d404 Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev 2023-04-18 15:11:25 +08:00
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
527339cd64 Merge branch 'xjjdev' into dev 2023-04-14 14:21:52 +08:00
48ce44476d 修改审批通过的画作数量查询条件 2023-04-14 14:21:45 +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
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
00e3401985 完善对账单 2023-04-04 09:37:00 +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
82839afb83 Merge branch 'xjjdev' 2023-03-31 15:32:49 +08:00
f061ba6465 用户视图新增字段并更新pb文件 2023-03-31 15:31:41 +08:00
c2cbc5dfe0 Merge branch 'xjjdev' 2023-03-29 23:39:25 +08:00
8f8a8208b9 更新pb文件 2023-03-29 23:39:04 +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
bc0f15f77e 新增画作预览列表的筛选条件 2023-03-28 13:38:07 +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
5475034aaa Merge branch 'xjjdev' into dev 2023-03-24 13:10:01 +08:00
0459319c2a 为邀请关系增加筛选条件 2023-03-24 13:09:17 +08:00
songchuang
3afa12c1e9 StatementList 修改 2023-03-24 11:50:20 +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
85a561f06c Merge branch 'xjjdev' into dev 2023-03-24 10:10:35 +08:00
songchuang
690bc74f1d 物权表结构修改,修改部分物权代码 2023-03-24 09:41:11 +08:00
9d8012f1f2 用户查询新增关键字搜索 2023-03-23 19:35:03 +08:00
songchuang
6b9870d3bd 对账单添加接口,原合同部分修改 2023-03-23 18:31:10 +08:00
songchuang
e4e298d921 对账单增加接口 2023-03-23 17:17:29 +08:00
songchuang
baa1bea012 对账单代码上传 2023-03-22 16:16:16 +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
01487ea4c4 Merge branch 'dev' of http://192.168.12.3:8090/bugmaker/fonchain-artistinfo into dev 2023-03-18 10:12:41 +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
8ae73232c5 FinishContractRequest参数首字母大写 2023-03-18 09:39:44 +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
d4a8f1cb34 修改了对账单pb文件中命名方式不正确的字段 2023-03-17 15:17:25 +08:00
5116b6aff8 Merge branch 'xjjdev' into dev 2023-03-17 14:40:07 +08:00