Commit Graph

380 Commits

Author SHA1 Message Date
songchuang
920cfef5eb 测试修改 2023-04-11 14:43:43 +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
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
songchuang
6af2d992aa Merge branch 'songchuang' into dev 2023-04-07 13:41:48 +08:00
3d08ba4ee2 环境变量测试3 2023-04-07 11:42:27 +08:00
4cba6ffd8c 环境变量测试2 2023-04-07 10:41:32 +08:00
8f7618b8bd 环境变量测试2 2023-04-07 10:33:48 +08:00
338439db59 环境变量测试 2023-04-07 10:20:05 +08:00
458c5e3bc8 修改dockerfile测试 2023-04-07 10:08:49 +08:00
1d9f336db3 Merge branch 'xjjdev' 2023-04-07 09:48:45 +08:00
36e39bf089 Merge branch 'xjjdev' into dev 2023-04-07 09:48:33 +08:00
247541fb24 删除不必要的数据表 2023-04-07 09:48:25 +08:00
04bd03022d Merge branch 'xjjdev' into dev 2023-04-07 08:08:34 +08:00
5506727220 注释掉初始化时不需要的表 2023-04-07 08:08:08 +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
e5b80f16d2 增加对账单配置文件 2023-04-04 10:35:56 +08:00
00e3401985 完善对账单 2023-04-04 09:37:00 +08:00
586ec2a90f Merge branch 'xjjdev' 2023-04-04 08:55:09 +08:00
9a7912b28a 修改字段gorm标签 2023-04-04 08:54:49 +08:00
45f193589b Merge branch 'xjjdev' into dev 2023-04-04 08:48:13 +08:00
804aad3991 Merge branch 'xjjdev' 2023-04-04 08:45:41 +08:00
aadf819e01 修改视图字段名称 2023-04-04 08:45:01 +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
747212fd29 合同表新增字段 2023-04-03 13:46:20 +08:00
0b70cfa251 Merge branch 'xjjdev' 2023-04-03 09:46:08 +08:00
e6ee6424c0 新增表字段remark 2023-04-03 09:45:50 +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
c8ca3aa02f Merge branch 'xjjdev' 2023-04-01 09:54:17 +08:00
eb42ceec3f 邀请关系表增加去重索引 2023-04-01 09:54:08 +08:00
92dde6ee25 Merge branch 'xjjdev' 2023-04-01 09:37:45 +08:00
b2844379fb 针对历史画作联动删除的问题,提供备用方案 2023-04-01 09:37:35 +08:00
1eba4ba5be 增加基本画作历史记录的统计方式 2023-04-01 09:35:47 +08:00