Commit Graph

260 Commits

Author SHA1 Message Date
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
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
ec1eba24cb update 2023-03-31 16:59:23 +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
9fbc31fdd2 Merge branch 'xjjdev' 2023-03-31 14:08:57 +08:00
917b61de02 为数据库dsn增加时区 2023-03-31 14:08:44 +08:00
db6e137598 Merge branch 'xjjdev' 2023-03-31 13:52:59 +08:00
c3cdd52daa 修复受邀请人查询条件问题 2023-03-31 13:52:47 +08:00
c49275c1de Merge branch 'xjjdev' 2023-03-31 11:45:14 +08:00
143fde30e0 优化邀请关系处理逻辑 2023-03-31 11:45:06 +08:00
73264cde5d Merge branch 'xjjdev' 2023-03-31 11:42:58 +08:00
9315e15011 修复查询不到邀请人id的问题 2023-03-31 11:42:49 +08:00