Commit Graph

210 Commits

Author SHA1 Message Date
songchuang
11a95c013f 对账单代码测试修改 2023-04-19 15:56:55 +08:00
songchuang
4e0e4f4463 对账单测试代码提交 2023-04-19 15:09:21 +08:00
songchuang
bc9fdd9e6e 对账单测试代码提交 2023-04-19 14:51:01 +08:00
songchuang
ffdc7f3a61 对账单测试代码提交 2023-04-19 13:44:14 +08:00
f4cf06081d Merge branch 'xjjdev' into dev 2023-04-19 12:04:28 +08:00
4c5c88c2f1 邀请关系的加入时间使用用户创建时间 2023-04-19 12:04:18 +08:00
3416cca9c6 Merge branch 'dev' of http://gitlab.fontree.cn/bugmaker/fonchain-artistinfo into dev 2023-04-19 11:51:34 +08:00
f4f24f6b72 Merge branch 'xjjdev' into dev 2023-04-19 11:51:30 +08:00
27a5d5de2b 邀请列表按照邀请时间倒序 2023-04-19 11:41:20 +08:00
songchuang
a6d30beca2 对账单测试代码提交 2023-04-19 11:16:58 +08:00
songchuang
f66da7a009 对账单代码测试修改 2023-04-18 17:00:09 +08:00
songchuang
01f94832bb 对账单代码测试修改 2023-04-18 16:51:32 +08:00
5292993f7b Merge branch 'xjjdev' into dev 2023-04-18 16:27:44 +08:00
7df1ac96f2 修复检查邀请全息sql写错 2023-04-18 16:27:19 +08:00
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
cd202e3485 Merge branch 'xjjdev' into dev 2023-04-18 15:11:17 +08:00
c8aaa4b3bb 重要更新,修复邀请码查询大小写不敏感的问题 2023-04-18 15:09:35 +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
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
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