jhc
|
a39facfe63
|
修改
|
2023-05-18 18:12:58 +08:00 |
|
jhc
|
520b11b369
|
Merge branch 'oa' into dev
|
2023-05-18 16:13:41 +08:00 |
|
jhc
|
b58c70825f
|
oa 审批 类型筛选
|
2023-05-18 16:13:28 +08:00 |
|
jhc
|
1c684b3f2a
|
Merge branch 'oa' into dev
|
2023-05-16 16:29:41 +08:00 |
|
jhc
|
9fc156be43
|
leaveApply 添加 leaveBalance
|
2023-05-16 16:29:29 +08:00 |
|
jhc
|
58b79614af
|
Merge branch 'oa' into dev
|
2023-05-16 15:42:38 +08:00 |
|
jhc
|
65a53f905d
|
leaveApply 添加 leaveBalance 字段
|
2023-05-16 15:42:19 +08:00 |
|
jhc
|
2ce5ae8dd6
|
Merge branch 'oa' into dev
|
2023-05-16 13:30:42 +08:00 |
|
jhc
|
2c5f6df7e8
|
添加 输出
|
2023-05-16 13:30:31 +08:00 |
|
jhc
|
b770c2de2c
|
修改 update oa
|
2023-05-16 13:28:23 +08:00 |
|
jhc
|
ec7fe28657
|
Merge branch 'oa' into dev
|
2023-05-16 11:57:16 +08:00 |
|
jhc
|
8518a5e877
|
修改
|
2023-05-16 11:57:06 +08:00 |
|
jhc
|
ddc1b4f554
|
Merge branch 'oa' into dev
|
2023-05-16 11:01:17 +08:00 |
|
jhc
|
88c6f7b29a
|
修改
|
2023-05-16 11:00:59 +08:00 |
|
jhc
|
1750437dfb
|
Merge branch 'oa' into dev
|
2023-05-16 10:52:38 +08:00 |
|
jhc
|
8588b16469
|
添加字段 BundlePayPrice -> rollback
|
2023-05-16 10:52:24 +08:00 |
|
jhc
|
8f5015a173
|
Merge branch 'oa' into dev
|
2023-05-16 10:46:21 +08:00 |
|
jhc
|
660bbce0c9
|
修改,画展包付款单添加rollback
|
2023-05-16 10:46:04 +08:00 |
|
jhc
|
138e9087e1
|
Merge branch 'oa' into dev
|
2023-05-15 10:24:20 +08:00 |
|
jhc
|
e23bab0b50
|
修改
|
2023-05-15 10:24:07 +08:00 |
|
jhc
|
55c61ec640
|
Merge branch 'oa' into dev
|
2023-05-15 10:16:19 +08:00 |
|
jhc
|
7edc94505a
|
修改
|
2023-05-15 10:15:59 +08:00 |
|
jhc
|
e7f3e6f5ad
|
Merge branch 'oa' into dev
|
2023-05-15 09:59:50 +08:00 |
|
jhc
|
02fda9646c
|
修改
|
2023-05-15 09:59:38 +08:00 |
|
jhc
|
b640658f98
|
Merge branch 'oa' into dev
|
2023-05-15 09:42:17 +08:00 |
|
jhc
|
f6a7448cb3
|
修改
|
2023-05-15 09:42:02 +08:00 |
|
jhc
|
803fbd1030
|
Merge branch 'oa' into dev
|
2023-05-15 09:21:08 +08:00 |
|
jhc
|
ebc8f61f49
|
修改
|
2023-05-15 09:20:53 +08:00 |
|
jhc
|
4516cabe82
|
Merge branch 'oa' into dev
|
2023-05-15 09:16:37 +08:00 |
|
jhc
|
fd10885573
|
修改
|
2023-05-15 09:16:23 +08:00 |
|
jhc
|
ed6665a70b
|
Merge branch 'oa' into dev
|
2023-05-12 17:39:51 +08:00 |
|
jhc
|
9e96e6310c
|
修改
|
2023-05-12 17:39:31 +08:00 |
|
jhc
|
9fcdbb5194
|
Merge branch 'oa' into dev
|
2023-05-12 17:33:47 +08:00 |
|
jhc
|
815f7273db
|
修改
|
2023-05-12 17:33:33 +08:00 |
|
jhc
|
9f9ff4e3de
|
Merge branch 'oa' into dev
|
2023-05-12 17:29:23 +08:00 |
|
jhc
|
73075d6be9
|
修海
|
2023-05-12 17:29:04 +08:00 |
|
jhc
|
f94041918f
|
Merge branch 'oa' into dev
|
2023-05-12 17:26:28 +08:00 |
|
jhc
|
a55529b1bb
|
修改
|
2023-05-12 17:26:12 +08:00 |
|
jhc
|
708733e99a
|
Merge branch 'oa' into dev
|
2023-05-12 17:14:06 +08:00 |
|
jhc
|
f4c7bc7b03
|
修改
|
2023-05-12 17:13:40 +08:00 |
|
jhc
|
19460c5fdc
|
修改冲突
|
2023-05-12 16:25:03 +08:00 |
|
jhc
|
fc0865f83b
|
修改
|
2023-05-12 16:24:12 +08:00 |
|
jhc
|
58c1ab43f1
|
修改
|
2023-05-12 16:22:29 +08:00 |
|
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 |
|