autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-14 15:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Guoqs
2024-07-01 14:23:20 +08:00
parent d0bdd14c54 d2d7e495ab
commit f924a43e8b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/AMapController.java vendored
View File

@@ -17,7 +17,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* TODO * 高德地图Controller
* *
* @author Lemon * @author Lemon
* @Date 2023/6/16 13:56 * @Date 2023/6/16 13:56

2
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -256,7 +256,7 @@
<if test="freeTime != null"> <if test="freeTime != null">
free_time = #{freeTime}, free_time = #{freeTime},
</if> </if>
<if test="occupyFee != null"> <if test="occupyFee != null and occupyFee != ''">
occupy_fee = #{occupyFee}, occupy_fee = #{occupyFee},
</if> </if>
<if test="maxOccupyFee != null"> <if test="maxOccupyFee != null">