Merge branch 'adapay' into merge_adapay

# Conflicts: # jsowell-admin/src/test/java/SpringBootTestController.java
2026-04-27 06:25:13 +08:00 · 2023-08-30 11:19:54 +08:00
parent 5dcf60ea8a e76e1109f6
commit c284445ce1
5 changed files with 2182 additions and 1770 deletions
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
@@ -78,4 +78,9 @@ public class GenerateOrderDTO extends BasicPileDTO{
 	 * 车牌号码
 	 */
 	private String plateNumber;
+
+	/**
+	 * 站点id
+	 */
+	private String stationId;
 }