更改合并字段命名避免触发关键字

wu

2024-09-05 2ca41e3710bacc49e36d109b47aeea093b9be332

更改合并字段命名避免触发关键字

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java

@@ -144,7 +144,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;


}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -73,7 +73,7 @@
                glassInfo.setYCoordinate(map.getYAxis());
                glassInfo.setAngle(map.getRotateAngle());
                glassInfo.setGlassId(map.getGlassId());
                glassInfo.setMerge(map.getMerge());
                glassInfo.setCombine(map.getMerge());
                // 将映射后的对象添加到结果列表中
                resultList.add(glassInfo);
            }