Merge branch 'feature/gongfu-20260126' into develop
This commit is contained in:
commit
fb5a57d9fc
|
|
@ -100,7 +100,6 @@ public class DeviceComponentController extends ControllerBase {
|
||||||
.like(StrUtil.isNotBlank(query.getProductLine()), GongfuDeviceComponent::getProductLine, query.getProductLine())
|
.like(StrUtil.isNotBlank(query.getProductLine()), GongfuDeviceComponent::getProductLine, query.getProductLine())
|
||||||
.list();
|
.list();
|
||||||
List<GongfuDeviceComponentDetail> details = deviceComponentDetailService.list();
|
List<GongfuDeviceComponentDetail> details = deviceComponentDetailService.list();
|
||||||
details.forEach(d -> d.setId(d.getDeviceComponentId()));
|
|
||||||
List<GongFuDeviceTypeVO> datas = new ArrayList<>();
|
List<GongFuDeviceTypeVO> datas = new ArrayList<>();
|
||||||
productLines.forEach(p -> {
|
productLines.forEach(p -> {
|
||||||
GongFuDeviceTypeVO vo = datas.stream()
|
GongFuDeviceTypeVO vo = datas.stream()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue