jhc
|
044b1bf0eb
|
修改冲突
|
2023-06-02 16:19:33 +08:00 |
|
jhc
|
0431b6f003
|
重新生成pb 文件
|
2023-06-02 11:58:14 +08:00 |
|
jhc
|
fdbd0b8680
|
删除 approval文件夹
|
2023-06-02 11:52:40 +08:00 |
|
jhc
|
bde6592a2a
|
删除 pb 文件
|
2023-06-02 11:51:19 +08:00 |
|
jhc
|
f01f5b6418
|
Merge branch 'jhc' into dev
|
2023-06-02 11:43:29 +08:00 |
|
jhc
|
90d35a9548
|
修改 pb
|
2023-06-02 11:43:13 +08:00 |
|
jhc
|
34697d8c46
|
Merge branch 'jhc' into dev
|
2023-06-02 11:37:00 +08:00 |
|
jhc
|
15bc70493b
|
xiugai
|
2023-06-02 11:36:38 +08:00 |
|
jhc
|
84aab43644
|
Merge branch 'jhc' into dev
|
2023-06-02 11:31:26 +08:00 |
|
jhc
|
71f53107c3
|
空提交
|
2023-06-02 11:31:11 +08:00 |
|
jhc
|
5447cee77b
|
修改冲突
|
2023-06-02 11:00:43 +08:00 |
|
jhc
|
3367b8c26f
|
修改冲突
|
2023-06-02 10:51:10 +08:00 |
|
jhc
|
978ff2f882
|
付款单 添加 操作数量字段
|
2023-06-02 10:46:46 +08:00 |
|
jhc
|
b4c3f301da
|
Merge branch 'oa' into dev
|
2023-05-29 14:24:19 +08:00 |
|
jhc
|
15db7ce413
|
更新 leaveApply
|
2023-05-29 14:24:00 +08:00 |
|
jhc
|
9feeb51a08
|
Merge branch 'oa' into dev
|
2023-05-29 13:42:10 +08:00 |
|
jhc
|
dcebb9942b
|
修改更新
|
2023-05-29 13:41:59 +08:00 |
|
jhc
|
91e973f204
|
Merge branch 'oa' into dev
|
2023-05-29 13:35:27 +08:00 |
|
jhc
|
6ccf358f6c
|
修改
|
2023-05-29 13:34:35 +08:00 |
|
jhc
|
f84a045456
|
Merge branch 'oa' into dev
|
2023-05-29 13:06:37 +08:00 |
|
jhc
|
ff228f6f7a
|
修改
|
2023-05-29 13:06:24 +08:00 |
|
jhc
|
06f02d07bd
|
Merge branch 'oa' into dev
|
2023-05-29 10:20:55 +08:00 |
|
jhc
|
0fcfc7926f
|
setStatus 添加 leaveBalance字段
|
2023-05-29 10:20:45 +08:00 |
|
jhc
|
1001127d11
|
Merge branch 'jhc'
|
2023-05-23 15:00:27 +08:00 |
|
jhc
|
26dd1a5672
|
添加 字段 rollback
|
2023-05-23 15:00:04 +08:00 |
|
jhc
|
a3c32ee58e
|
Merge branch 'jhc'
|
2023-05-23 14:51:26 +08:00 |
|
jhc
|
732d6fbe30
|
添加 rollback
|
2023-05-23 14:51:03 +08:00 |
|
jhc
|
ad7b63161e
|
Merge branch 'oa' into dev
|
2023-05-23 10:33:09 +08:00 |
|
jhc
|
fee84e25a5
|
修改 oa审批
|
2023-05-23 10:32:53 +08:00 |
|
jhc
|
d0c37c9587
|
Merge branch 'oa' into dev
|
2023-05-22 15:26:05 +08:00 |
|
jhc
|
c30f372cd4
|
修改 staffUID 类型
|
2023-05-22 15:25:45 +08:00 |
|
jhc
|
b0c08f0cde
|
Merge branch 'oa' into dev
|
2023-05-18 18:35:56 +08:00 |
|
jhc
|
42b13a6945
|
修改
|
2023-05-18 18:35:42 +08:00 |
|
jhc
|
7d61d8b0c7
|
Merge branch 'oa' into dev
|
2023-05-18 18:32:30 +08:00 |
|
jhc
|
19fcc01688
|
修改
|
2023-05-18 18:32:17 +08:00 |
|
jhc
|
94950c1fbb
|
Merge branch 'oa' into dev
|
2023-05-18 18:23:58 +08:00 |
|
jhc
|
d7af19ef70
|
修改
|
2023-05-18 18:23:49 +08:00 |
|
jhc
|
b9b389e25c
|
Merge branch 'oa' into dev
|
2023-05-18 18:21:37 +08:00 |
|
jhc
|
69d84a0efc
|
修改
|
2023-05-18 18:21:20 +08:00 |
|
jhc
|
025d306d67
|
Merge branch 'oa' into dev
|
2023-05-18 18:13:12 +08:00 |
|
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 |
|