756 Commits

Author SHA1 Message Date
weiz
560d961322 Merge pull request 'zhangwei' (#193) from zhangwei into dev
Reviewed-on: #193
2024-01-18 10:52:27 +08:00
weiz
a405995ebf update 2024-01-18 10:52:00 +08:00
weiz
9788376a47 Merge pull request 'zhangwei' (#193) from zhangwei into dev
Reviewed-on: #193
2024-01-18 10:48:12 +08:00
weiz
7fbd4c7f70 update 2024-01-18 10:47:48 +08:00
weiz
75cda5ac5a update 2024-01-18 10:42:47 +08:00
weiz
2b96135df8 Merge pull request 'update' (#192) from zhangwei into dev
Reviewed-on: #192
2024-01-18 10:39:56 +08:00
weiz
99306d5018 update 2024-01-18 10:39:26 +08:00
weiz
5fc3206cdc Merge pull request 'update' (#191) from zhangwei into dev
Reviewed-on: #191
2024-01-17 18:09:31 +08:00
weiz
c8357a6bd1 update 2024-01-17 18:09:02 +08:00
weiz
56e22d1670 Merge pull request 'update' (#190) from zhangwei into dev
Reviewed-on: #190
2024-01-17 18:02:59 +08:00
weiz
d47f792dc7 update 2024-01-17 18:02:29 +08:00
weiz
4e85e98bf6 Merge pull request 'update' (#189) from zhangwei into dev
Reviewed-on: #189
2024-01-17 17:52:02 +08:00
weiz
0b109bb8f0 update 2024-01-17 17:51:27 +08:00
weiz
eaefa4451c Merge pull request 'update' (#188) from zhangwei into dev
Reviewed-on: #188
2024-01-17 17:21:41 +08:00
weiz
004d90ae6d update 2024-01-17 17:21:15 +08:00
weiz
579d2c902d Merge pull request 'update' (#187) from zhangwei into dev
Reviewed-on: #187
2024-01-17 16:09:05 +08:00
weiz
b183862a6b update 2024-01-17 16:08:23 +08:00
weiz
50e1ade7f7 Merge pull request '新增项目成本调整模块' (#186) from zhangwei into dev
Reviewed-on: #186
2024-01-17 14:09:23 +08:00
weiz
29e4f22ce9 新增项目成本调整模块 2024-01-17 14:08:46 +08:00
weiz
18c110a9f0 Merge pull request 'update' (#185) from zhangwei into dev
Reviewed-on: #185
2024-01-17 13:39:45 +08:00
weiz
cc92ff7d13 update 2024-01-17 13:39:10 +08:00
weiz
3488a2f3dc Merge pull request '新增借款申请模块' (#184) from zhangwei into dev
Reviewed-on: #184
2024-01-17 11:53:45 +08:00
weiz
b38341c1ae 新增借款申请模块 2024-01-17 11:53:11 +08:00
weiz
7d79a836d8 Merge pull request '新增出差申请模块' (#183) from zhangwei into dev
Reviewed-on: #183
2024-01-17 10:43:18 +08:00
weiz
6bec557ab6 新增出差申请模块 2024-01-17 10:42:23 +08:00
weiz
ade97f7eeb Merge pull request 'add project_cost_budget' (#182) from zhangwei into dev
Reviewed-on: #182
2024-01-16 15:58:01 +08:00
weiz
8fdb154242 add project_cost_budget 2024-01-16 15:57:32 +08:00
weiz
b0d8f590f4 Merge pull request 'add project_equipment_budget' (#181) from zhangwei into dev
Reviewed-on: #181
2024-01-16 14:16:49 +08:00
weiz
5315bc7aee add project_equipment_budget 2024-01-16 14:15:55 +08:00
weiz
a17732842e Merge pull request 'add project_labor_budget' (#180) from zhangwei into dev
Reviewed-on: #180
2024-01-16 11:28:27 +08:00
weiz
696ef7c544 add project_labor_budget 2024-01-16 11:26:24 +08:00
mkm
a1727ed68a 更新 2024-01-15 18:56:42 +08:00
weiz
3ece35ade3 Merge pull request 'update' (#179) from zhangwei into dev
Reviewed-on: #179
2024-01-15 15:48:46 +08:00
weiz
2cd09e8e5b update 2024-01-15 15:48:15 +08:00
weiz
a539abdaab Merge pull request 'update' (#178) from zhangwei into dev
Reviewed-on: #178
2024-01-15 15:41:07 +08:00
weiz
8fc7710f63 update 2024-01-15 15:40:40 +08:00
weiz
7844d6a3d8 Merge pull request 'update' (#177) from zhangwei into dev
Reviewed-on: #177
2024-01-15 15:07:17 +08:00
weiz
9475b5c7c9 update 2024-01-15 15:06:39 +08:00
weiz
d3e6072bdf Merge pull request 'update' (#176) from zhangwei into dev
Reviewed-on: #176
2024-01-15 15:00:35 +08:00
weiz
cb0a010517 update 2024-01-15 14:59:41 +08:00
weiz
ced3b0b122 Merge pull request 'update' (#175) from zhangwei into dev
Reviewed-on: #175
2024-01-15 14:09:32 +08:00
weiz
b139c7f638 update 2024-01-15 14:08:56 +08:00
weiz
75953e42ef Merge pull request 'update' (#174) from zhangwei into dev
Reviewed-on: #174
2024-01-15 13:59:09 +08:00
weiz
f3c2c82c62 update 2024-01-15 13:58:41 +08:00
weiz
4433439c64 Merge pull request 'update' (#173) from zhangwei into dev
Reviewed-on: #173
2024-01-15 13:55:55 +08:00
weiz
eb484d10ac update 2024-01-15 13:55:16 +08:00
weiz
9302aa19f1 Merge pull request 'zhangwei' (#172) from zhangwei into dev
Reviewed-on: #172
2024-01-15 11:33:28 +08:00
weiz
abdcaf74b2 Merge branch 'dev' into zhangwei 2024-01-15 11:32:39 +08:00
weiz
0a3e9995f2 update 2024-01-15 11:31:34 +08:00
mkm
8a195679f3 申请明细-更新custom_name 2024-01-15 10:52:02 +08:00