jhc
|
57397737d2
|
修改 pb
|
2023-05-04 10:43:48 +08:00 |
|
jhc
|
844730ad0b
|
修改
|
2023-05-04 10:17:33 +08:00 |
|
jhc
|
05cc84845d
|
修改冲突
|
2023-05-04 10:15:50 +08:00 |
|
jhc
|
c48a390a88
|
Merge branch 'jhc' into dev
|
2023-04-26 20:48:55 +08:00 |
|
jhc
|
730e2b869e
|
修复
|
2023-04-26 20:48:38 +08:00 |
|
jhc
|
a8ce2cb45e
|
Merge branch 'jhc' into dev
|
2023-04-26 20:46:12 +08:00 |
|
jhc
|
aedf8f525a
|
画展包 添加经纪人字段
|
2023-04-26 20:45:52 +08:00 |
|
jhc
|
155c3d7477
|
Merge branch 'jhc' into dev
|
2023-04-25 15:31:30 +08:00 |
|
jhc
|
2462790f40
|
修改
|
2023-04-25 15:27:49 +08:00 |
|
jhc
|
e3e93400cb
|
Merge branch 'jhc' into dev
|
2023-04-25 15:25:47 +08:00 |
|
jhc
|
f92a39033b
|
修改
|
2023-04-25 15:25:30 +08:00 |
|
jhc
|
5942b76a3f
|
修改
|
2023-04-25 15:17:46 +08:00 |
|
jhc
|
4c6a62a184
|
Merge branch 'jhc' into dev
|
2023-04-25 14:42:33 +08:00 |
|
jhc
|
4d770592d1
|
调整
|
2023-04-25 14:42:24 +08:00 |
|
jhc
|
8553921da8
|
Merge branch 'jhc' into dev
|
2023-04-25 14:15:25 +08:00 |
|
jhc
|
40d41ba7ea
|
修改
|
2023-04-25 14:15:05 +08:00 |
|
jhc
|
b4a1074513
|
Merge branch 'jhc' into dev
|
2023-04-25 13:30:52 +08:00 |
|
jhc
|
f4bf38893d
|
添加 serializer:json
|
2023-04-25 13:30:32 +08:00 |
|
jhc
|
9dd1d3bd53
|
Merge branch 'jhc' into dev
|
2023-04-25 13:22:20 +08:00 |
|
jhc
|
d8271cbbda
|
修改 copier复制
|
2023-04-25 13:22:06 +08:00 |
|
jhc
|
9846c33fd1
|
Merge branch 'jhc' into dev
|
2023-04-25 11:46:13 +08:00 |
|
jhc
|
abf38c47d6
|
修改 财务报表审批
|
2023-04-25 11:46:00 +08:00 |
|
jhc
|
007da446bd
|
修改冲突
|
2023-04-25 11:09:49 +08:00 |
|
jhc
|
5ae4913fca
|
添加 财务报表审批
|
2023-04-25 11:07:00 +08:00 |
|
jhc
|
a974e0def3
|
Merge branch 'jhc' into dev
|
2023-04-24 19:38:14 +08:00 |
|
jhc
|
b8ec6a70a6
|
修改
|
2023-04-24 19:37:56 +08:00 |
|
jhc
|
300e818750
|
Merge branch 'jhc' into dev
|
2023-04-24 19:04:21 +08:00 |
|
jhc
|
357db1c143
|
财务报表审批 设置
|
2023-04-24 19:04:04 +08:00 |
|
jhc
|
a769dd08bf
|
oa 审批 未完成
|
2023-04-24 16:17:01 +08:00 |
|
jhc
|
131d247db7
|
Merge branch 'jhc' into dev
|
2023-04-24 15:52:57 +08:00 |
|
jhc
|
06f56fc0b0
|
添加 财务表报审批类型
|
2023-04-24 15:52:43 +08:00 |
|
jhc
|
da91d1e9be
|
Merge branch 'jhc' into dev
|
2023-04-21 15:30:55 +08:00 |
|
jhc
|
611fecad5d
|
修改 类型
|
2023-04-21 15:30:42 +08:00 |
|
jhc
|
41f30a1193
|
Merge branch 'jhc' into dev
|
2023-04-21 15:11:28 +08:00 |
|
jhc
|
734b0a86a8
|
添加 oa 类型
|
2023-04-21 15:09:28 +08:00 |
|
jhc
|
eee8529c77
|
Merge branch 'jhc' into dev
|
2023-04-14 09:27:18 +08:00 |
|
jhc
|
44b76dc6ea
|
待阅读、已阅读列表 终极版 1.0
|
2023-04-14 09:26:09 +08:00 |
|
jhc
|
17f31ce8d0
|
Merge branch 'jhc' into dev
|
2023-04-14 09:21:47 +08:00 |
|
jhc
|
d157d072e5
|
待阅读、已阅读列表 终极版
|
2023-04-14 09:21:13 +08:00 |
|
jhc
|
28f61be90b
|
Merge branch 'jhc' into dev
|
2023-04-14 09:03:22 +08:00 |
|
jhc
|
a018fc944f
|
取消 submitter 条件查询
|
2023-04-14 09:02:56 +08:00 |
|
jhc
|
dea66c18d1
|
Merge branch 'jhc' into dev
|
2023-04-13 20:15:15 +08:00 |
|
jhc
|
b8eb4ebd0c
|
修改 待阅读和阅读 4.0
|
2023-04-13 20:14:58 +08:00 |
|
jhc
|
e18b5efa84
|
Merge branch 'jhc' into dev
|
2023-04-13 20:09:11 +08:00 |
|
jhc
|
9adf5a9acb
|
修改 待阅读和阅读 3.0
|
2023-04-13 20:08:55 +08:00 |
|
jhc
|
fb40e8f200
|
修改查询 已阅和待阅读 1.0
|
2023-04-13 18:42:21 +08:00 |
|
jhc
|
3a99d797d5
|
修改查询 已阅和待阅读
|
2023-04-13 18:33:11 +08:00 |
|
|
|
b029be9a48
|
fix 2
|
2023-04-11 10:43:57 +08:00 |
|
|
|
98cb3e36f4
|
1
|
2023-04-10 17:23:41 +08:00 |
|
|
|
309523f6c3
|
fix 11
|
2023-04-10 17:18:53 +08:00 |
|
|
|
bae6d83261
|
发
|
2023-04-10 17:09:25 +08:00 |
|
|
|
cf71298bca
|
fix update
|
2023-04-10 17:01:45 +08:00 |
|
|
|
9279806673
|
fix
|
2023-04-10 16:55:16 +08:00 |
|
jhc
|
3eda8edeea
|
Merge branch 'main' of http://192.168.12.3:8090/bugmaker/management_system/fonchain-approval
|
2023-04-07 09:43:09 +08:00 |
|
jhc
|
229ef3e809
|
修改 润格审批
|
2023-04-04 13:44:27 +08:00 |
|
jhc
|
9e8f13853f
|
添加润格审批总价
|
2023-04-04 09:59:15 +08:00 |
|
|
|
7b7fe93567
|
feat
|
2023-03-31 10:53:42 +08:00 |
|
|
|
5690a6697c
|
feat 对已经申请过的进行处理
|
2023-03-27 14:57:26 +08:00 |
|
|
|
2618dfa869
|
feat 版本号
|
2023-03-24 16:04:23 +08:00 |
|
|
|
5cbc385afb
|
feat
|
2023-03-24 15:03:38 +08:00 |
|
|
|
9352666fdf
|
feat
|
2023-03-22 14:27:32 +08:00 |
|
|
|
a9d7308263
|
feat
|
2023-03-22 14:23:44 +08:00 |
|
|
|
b082f549dd
|
feat
|
2023-03-22 10:24:24 +08:00 |
|
|
|
f6416d552f
|
feat
|
2023-03-20 18:26:13 +08:00 |
|
|
|
4c68923ae0
|
feat
|
2023-03-18 16:35:55 +08:00 |
|
|
|
b0b568a038
|
feat
|
2023-03-01 18:53:47 +08:00 |
|
|
|
19d959db92
|
feat
|
2023-02-03 16:15:21 +08:00 |
|
|
|
e4e6f8ed37
|
feat 增加work保存记录画家uid
|
2023-02-01 13:18:09 +08:00 |
|
|
|
c2331415fe
|
feat
|
2023-01-28 09:12:12 +08:00 |
|
|
|
d29b55b318
|
fix 修改审批中画展包的逻辑
|
2023-01-16 16:09:19 +08:00 |
|
|
|
aec05feaea
|
fix 修改审批中画展包的逻辑
|
2022-10-14 16:48:45 +08:00 |
|
|
|
6a105190fc
|
fix 只修改部分字段
|
2022-09-14 18:13:51 +08:00 |
|
|
|
7caf25aac7
|
fix 统一code返回
|
2022-09-08 15:28:28 +08:00 |
|
|
|
f47281fdab
|
fix 修改我的工作列表展示逻辑
|
2022-08-27 11:54:59 +08:00 |
|
|
|
91e5f49528
|
fix 更新sql
|
2022-08-26 11:37:55 +08:00 |
|
|
|
c02b69bb62
|
fix 更新覆盖
|
2022-08-25 15:53:38 +08:00 |
|
|
|
93259f98b1
|
fix keyword展示
|
2022-08-25 15:11:03 +08:00 |
|
|
|
00ec051561
|
fix 类型删除改成多选删除
|
2022-08-23 16:20:06 +08:00 |
|
|
|
e77bd62ba8
|
feat 多级审批
feat 审批类型
|
2022-08-18 13:26:14 +08:00 |
|
|
|
130a73bf70
|
feat 多级审批
feat 审批类型
|
2022-08-16 18:45:28 +08:00 |
|
|
|
4f3cb9fe45
|
fix 统一分页
|
2022-08-12 13:24:33 +08:00 |
|
|
|
e1e93f2d07
|
feat dockerfile部署
|
2022-08-08 09:25:37 +08:00 |
|
|
|
98de31d7ae
|
fix 修改的时候做status校验
|
2022-08-04 12:03:02 +08:00 |
|
|
|
c98a5e86f4
|
feat 增加简洁审批
feat 增加数据校验
|
2022-08-04 11:58:33 +08:00 |
|
|
|
bc562c5976
|
feat 增加filter过滤
|
2022-08-04 11:07:55 +08:00 |
|
|
|
56028d1db0
|
feat 增加是否已读的列表页展示
|
2022-07-30 16:44:54 +08:00 |
|
|
|
cfa705caa9
|
fix 修改画作和画展更新的时候绑定关系更新错误
|
2022-07-30 13:11:18 +08:00 |
|
|
|
c885c3fb44
|
fix 返回数据没有返回类型信息
copyUser 是否观看字段类型改成bool
|
2022-07-30 11:41:22 +08:00 |
|
|
|
a61383bb1e
|
fix proto
|
2022-07-29 17:08:00 +08:00 |
|
|
|
15b3dcf55d
|
feat 更新数据 获取汇总统计数据
fix 修改exhibition中save的错误
|
2022-07-29 15:40:30 +08:00 |
|
|
|
ae137a6883
|
feat
DetailSetting UpdateSetting 已完成
Create Detail Remove List 待调试
Update 未开始
|
2022-07-28 17:18:01 +08:00 |
|
