jhc
|
83845f8037
|
Merge branch 'oa' into dev
|
2023-05-12 16:17:26 +08:00 |
|
jhc
|
0e381a32dc
|
修改
|
2023-05-12 16:17:08 +08:00 |
|
jhc
|
5740aea1a3
|
Merge branch 'oa' into dev
|
2023-05-12 16:08:56 +08:00 |
|
jhc
|
2061ae57f1
|
修改
|
2023-05-12 16:08:40 +08:00 |
|
jhc
|
cc7ff8cf0e
|
Merge branch 'oa' into dev
|
2023-05-12 16:03:13 +08:00 |
|
jhc
|
8584515c4f
|
修改
|
2023-05-12 16:02:56 +08:00 |
|
jhc
|
c26bc2f3a9
|
Merge branch 'oa' into dev
|
2023-05-12 15:58:42 +08:00 |
|
jhc
|
5b97610544
|
修改问题
|
2023-05-12 15:58:26 +08:00 |
|
jhc
|
de2ec5267c
|
Merge branch 'oa' into dev
|
2023-05-12 15:24:45 +08:00 |
|
jhc
|
0ec7533677
|
修改
|
2023-05-12 15:24:28 +08:00 |
|
jhc
|
a24a215b35
|
修改
|
2023-05-12 15:16:36 +08:00 |
|
jhc
|
7e44924c18
|
Merge branch 'oa' into dev
|
2023-05-12 15:11:50 +08:00 |
|
jhc
|
25a7a42329
|
修改
|
2023-05-12 15:11:36 +08:00 |
|
jhc
|
48a3a59c0f
|
取消 applyTimes 赋值
|
2023-05-12 14:54:28 +08:00 |
|
jhc
|
a616b677ba
|
Merge branch 'oa' into dev
|
2023-05-12 14:50:31 +08:00 |
|
jhc
|
3a329b0a05
|
修改
|
2023-05-12 14:50:15 +08:00 |
|
jhc
|
e5463203ee
|
Merge branch 'oa' into dev
|
2023-05-12 14:47:30 +08:00 |
|
jhc
|
568526bb23
|
输出 approval_oa
|
2023-05-12 14:47:17 +08:00 |
|
jhc
|
97e59297ca
|
Merge branch 'oa' into dev
|
2023-05-12 14:38:33 +08:00 |
|
jhc
|
b6b5b0e654
|
输出 approval_oa
|
2023-05-12 14:38:17 +08:00 |
|
jhc
|
9095e3f01b
|
Merge branch 'oa' into dev
|
2023-05-12 14:33:58 +08:00 |
|
jhc
|
69e0b9858f
|
输出 approval_oag
|
2023-05-12 14:33:40 +08:00 |
|
jhc
|
4fca4a1f98
|
Merge branch 'oa' into dev
|
2023-05-12 14:27:28 +08:00 |
|
jhc
|
3840a48571
|
修改 赋值
|
2023-05-12 14:27:15 +08:00 |
|
jhc
|
88090ec1eb
|
Merge branch 'oa' into dev
|
2023-05-12 10:59:14 +08:00 |
|
jhc
|
9f29def7f2
|
更新 oa审批的uuid到审批
|
2023-05-12 10:58:35 +08:00 |
|
jhc
|
ea8e5eb17f
|
Merge branch 'oa' into dev
|
2023-05-08 16:46:18 +08:00 |
|
jhc
|
e1610eb019
|
调整
|
2023-05-08 16:46:05 +08:00 |
|
jhc
|
4d7f3a672f
|
Merge branch 'oa' into dev
|
2023-05-08 10:52:16 +08:00 |
|
jhc
|
874c6d377a
|
oa审批
|
2023-05-08 10:52:00 +08:00 |
|
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 |
|
