dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-14 16:40:47 +08:00
commit 9650b67bb1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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