Commit Graph

268 Commits

Author SHA1 Message Date
f3fe2cc76f Merge branch 'xjjdev' 2023-04-19 13:27:48 +08:00
08cacd06b6 修复select后无法preload的问题 2023-04-19 13:27:42 +08:00
fa3364b20a Merge branch 'xjjdev' 2023-04-19 12:04:36 +08:00
4c5c88c2f1 邀请关系的加入时间使用用户创建时间 2023-04-19 12:04:18 +08:00
27a5d5de2b 邀请列表按照邀请时间倒序 2023-04-19 11:41:20 +08:00
ab7e002e6f Merge branch 'xjjdev' 2023-04-18 16:27:37 +08:00
7df1ac96f2 修复检查邀请全息sql写错 2023-04-18 16:27:19 +08:00
655def2437 Merge branch 'xjjdev' 2023-04-18 15:10:07 +08:00
c8aaa4b3bb 重要更新,修复邀请码查询大小写不敏感的问题 2023-04-18 15:09:35 +08:00
0bfe205582 Merge branch 'xjjdev' 2023-04-14 14:21:57 +08:00
48ce44476d 修改审批通过的画作数量查询条件 2023-04-14 14:21:45 +08:00
8294e41877 Merge branch 'xjjdev' 2023-04-13 16:33:02 +08:00
7f8760a7eb 修改注释 2023-04-13 14:16:16 +08:00
a05a7f9153 更新注释 2023-04-13 14:15:30 +08:00
5fe484ee49 修复特定情况下会重复创建邀请关系的问题 2023-04-13 14:14:11 +08:00
56451d16d9 Merge branch 'xjjdev' 2023-04-13 10:39:41 +08:00
a3caa53b86 更新字段控制判断 2023-04-13 10:26:49 +08:00
8a1030f23e Merge branch 'xjjdev' 2023-04-13 09:30:14 +08:00
31e16c8e0b 添加注释 2023-04-13 09:29:17 +08:00
af109513b6 基本画作审批列表查询条件优化 2023-04-13 09:23:46 +08:00
a4584a9592 按需求修改基本画作待审核列表的查询条件 2023-04-13 09:07:14 +08:00
9cb3a13532 画作新增字段是否入围国展 2023-04-12 17:51:11 +08:00
8b9d0cc18e 现要求暂存和锁定的画作都能进行审批和展示 2023-04-12 10:07:49 +08:00
cdfbd81ed9 修复没有更新画家id的问题 2023-04-11 16:42:26 +08:00
4ea006f6f0 Merge branch 'xjjdev' 2023-04-09 13:42:44 +08:00
057422051a 更新错误提示 2023-04-09 12:33:08 +08:00
d7baf112ac Merge branch 'xjjdev' 2023-04-07 14:28:53 +08:00
a7f8607d33 修复注册问题 2023-04-07 14:26:18 +08:00
bc23ba6090 Merge branch 'xjjdev' 2023-04-06 14:50:43 +08:00
e476abd2d3 解锁用户增加判断,没修改数据不让解锁 2023-04-06 14:49:54 +08:00
ce5ae4cdc2 Merge branch 'xjjdev' 2023-04-03 14:56:00 +08:00
87875ba6d0 修复用户查询接口只查询画家的问题 2023-04-03 14:55:41 +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