Commit Graph

117 Commits

Author SHA1 Message Date
8a1030f23e Merge branch 'xjjdev' 2023-04-13 09:30:14 +08:00
9cb3a13532 画作新增字段是否入围国展 2023-04-12 17:51:11 +08:00
77ddfb385a Merge branch 'xjjdev' 2023-04-01 10:03:23 +08:00
1784209447 修改历史画作查询的方式 2023-04-01 10:03:15 +08:00
0847107720 Merge branch 'xjjdev' 2023-04-01 10:00:16 +08:00
2bbf591dbb 修复 2023-04-01 10:00:03 +08:00
b2844379fb 针对历史画作联动删除的问题,提供备用方案 2023-04-01 09:37:35 +08:00
1eba4ba5be 增加基本画作历史记录的统计方式 2023-04-01 09:35:47 +08:00
a186312aa3 Merge branch 'xjjdev' 2023-03-31 17:37:34 +08:00
6c34f89356 debug5 2023-03-31 17:35:27 +08:00
20ba130ac0 Merge branch 'xjjdev' 2023-03-31 17:04:46 +08:00
6e677c42d4 问题调试4 2023-03-31 17:04:32 +08:00
b1f8c17bfd Merge branch 'xjjdev' 2023-03-31 17:00:27 +08:00
d00ddd30ee 问题调试3 2023-03-31 17:00:16 +08:00
6103b55f95 Merge branch 'xjjdev' 2023-03-31 16:46:29 +08:00
874e8d31dc 问题调试 2023-03-31 16:46:22 +08:00
3ae240645d Merge branch 'xjjdev' 2023-03-31 16:45:46 +08:00
24919d61c8 问题调试2 2023-03-31 16:45:33 +08:00
961c6dfbee Merge branch 'xjjdev' 2023-03-31 16:36:43 +08:00
e570eee9b5 问题调试 2023-03-31 16:36:34 +08:00
82839afb83 Merge branch 'xjjdev' 2023-03-31 15:32:49 +08:00
f061ba6465 用户视图新增字段并更新pb文件 2023-03-31 15:31:41 +08:00
e4be385783 Merge branch 'xjjdev' 2023-03-31 15:21:45 +08:00
207cbc097f 修复用户视图会统计已删除数据的问题 2023-03-31 15:21:09 +08:00
def89683a5 Merge branch 'xjjdev' 2023-03-29 23:16:54 +08:00
094a1d78b6 修复字段取值错误的问题 2023-03-29 23:16:39 +08:00
496e192765 修复分页传参错误的问题 2023-03-29 23:07:28 +08:00
01b8c6c6e2 修复字段取值错误的问题 2023-03-29 23:05:50 +08:00
0af56855e0 修复字段取值错误的问题 2023-03-29 23:02:27 +08:00
fc8b822a53 修复画家数据统计接口数据分页问题 2023-03-29 22:37:23 +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
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
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
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
songchuang
087ca51e06 contract 表 字段batchname改为batchtime 2023-03-24 10:58:37 +08:00
songchuang
690bc74f1d 物权表结构修改,修改部分物权代码 2023-03-24 09:41:11 +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