Merge remote-tracking branch 'origin/main'

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilNumber.java

@@ -23,6 +23,7 @@ public class OilNumber extends BaseEntity {
     @TableId(value = "number_id", type = IdType.AUTO)
     public Integer numberId; //id（主键)
     private String oilType; // 油品类型
+    private Integer oilId; // 油品id
     private String oilName; //油品名称
     private Double oilPrice; //油品单价
     private Double gbPrice; //国标价格

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml

@@ -34,10 +34,11 @@
     </select>
 
 
-    <select id="selectOilNumberList2" resultMap="OilNumberResult">
+    <select id="selectOilNumberList2" resultType="com.fuint.business.petrolStationManagement.entity.OilNumber">
         select
                omm.number_id ,
         onn.oil_type,
+        onn.id oilId,
         onn.oil_name,
         onn.id,
         omm.oil_price,