sliang
|
497a00493b
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
|
2023-12-22 20:42:29 +08:00 |
syruan
|
7f73c243f5
|
支持工程与往来单位及协议修改
|
2023-12-22 20:27:35 +08:00 |
|
sliang
|
621fe5a27a
|
获取领料申请-详情列表
|
2023-12-22 20:17:22 +08:00 |
|
syruan
|
04d79ac8b0
|
完善领料申请修改逻辑
|
2023-12-22 16:24:25 +08:00 |
|
syruan
|
3e1839ce64
|
合并分支，处理冲突异常
|
2023-12-22 15:21:18 +08:00 |
|
syruan
|
bf0c462853
|
删除领料明细接口提交
|
2023-12-22 15:10:27 +08:00 |
|
sliang
|
6d642b7edf
|
获取领料申请-详情列表
|
2023-12-22 14:48:58 +08:00 |
|
sliang
|
b19a375a4b
|
工机具管理-库管员配置；维修班配置
|
2023-12-21 18:35:36 +08:00 |
|
syruan
|
2f6f9ec862
|
申领任务删除
|
2023-12-21 12:04:38 +08:00 |
|
syruan
|
86575d4056
|
领料申请逻辑完善
|
2023-12-19 04:17:18 +08:00 |
|
syruan
|
9fa8b537c9
|
领料申请逻辑完善
|
2023-12-19 00:53:49 +08:00 |
 bns_han
|
e9cfbe9f29
|
移动退料申请，后台部分系统管理
|
2023-12-17 19:43:10 +08:00 |
|
syruan
|
d73fe10073
|
领料出库接口提交
|
2023-12-17 18:01:20 +08:00 |
 dingjie
|
171bea8437
|
任务冲突修改
|
2023-12-14 09:37:38 +08:00 |
|
syruan
|
76f5e2d65f
|
机具领料申请接口及业务逻辑的开发
|
2023-12-13 19:29:50 +08:00 |