Commit Graph

1835 Commits

Author SHA1 Message Date
c3c072d2a7 update 地锁逻辑修改 2023-09-09 15:05:37 +08:00
Lemon
147a5df11b update 修改费率页面回显占桩费率 2023-09-09 10:45:14 +08:00
Lemon
a28f274eec 中电联 查询站、桩、枪口信息接口、统计信息接口 2023-09-09 09:14:18 +08:00
7ec68cdb26 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-08 16:00:25 +08:00
Lemon
632a8dfcdb Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-08 15:51:23 +08:00
Lemon
a89d7e7ec0 update 使占桩订单免费/修改订单金额 2023-09-08 15:51:16 +08:00
1d88617168 Merge branch 'adapay' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
2023-09-08 15:50:51 +08:00
aa345ee629 Merge branch 'dev' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/resources/application-dev.yml
2023-09-08 15:48:57 +08:00
cc1fd3fafd update 地锁逻辑修改 2023-09-08 15:48:07 +08:00
9b7a5897a4 update 2023-09-08 14:26:13 +08:00
Lemon
43364537d3 update 2023-09-08 09:42:16 +08:00
Lemon
a36243ef78 update 中电联service 2023-09-08 09:31:03 +08:00
Lemon
557fa69811 新增占桩订单后管页面 2023-09-08 09:30:43 +08:00
Lemon
72699df4dc update 新增日志 2023-09-07 14:01:10 +08:00
Lemon
2f929d465b Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-06 14:55:21 +08:00
Lemon
cae981e390 新增 修改站点运营商时,将订单列表中的运营商id也进行修改 2023-09-06 14:55:14 +08:00
f23efa6069 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-06 14:30:12 +08:00
262cf27d8f update 2023-09-06 14:30:06 +08:00
Lemon
e1fa596818 后管平台测试员按钮添加权限校验 2023-09-06 11:18:38 +08:00
Lemon
36e7e025ab 添加字段 2023-09-06 10:35:17 +08:00
Lemon
98c92256f7 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-06 09:35:46 +08:00
Lemon
ad018e22f4 update 2023-09-06 09:35:39 +08:00
8befe2d745 update 2023-09-05 16:42:33 +08:00
Lemon
f1947e859f update 新增中电联相关实体 2023-09-05 15:53:16 +08:00
37bc31a6f6 update
(cherry picked from commit de3fe081f8)
2023-09-05 15:50:25 +08:00
de3fe081f8 update 2023-09-05 15:44:25 +08:00
Lemon
39e0463d35 地锁列表新增车位号字段 2023-09-05 09:43:19 +08:00
9a47834e7f update 2023-09-05 08:42:05 +08:00
64b2122d1a update订单逻辑改造工厂模式 2023-09-04 16:25:59 +08:00
2f242b2ef9 update订单逻辑改造工厂模式 2023-09-04 15:41:58 +08:00
f6621a9a22 update订单逻辑改造工厂模式 2023-09-04 15:37:43 +08:00
Lemon
f1f6c10024 update 2023-09-04 14:23:27 +08:00
7cc8563de6 Merge branch 'adapay' into merge_adapay 2023-09-04 14:19:14 +08:00
cd31278b64 Merge branch 'dev' into merge_adapay 2023-09-04 14:19:08 +08:00
93d4128a0d update 提现状态 2023-09-04 12:00:37 +08:00
b82ae004bb update订单逻辑改造工厂模式 2023-09-04 11:43:22 +08:00
24b6e757d1 update 修改测试数据库地址 2023-09-02 16:38:02 +08:00
0677ba321b update 修改测试数据库地址 2023-09-02 16:26:32 +08:00
1a490c3b75 update 修改测试数据库地址 2023-09-02 15:55:56 +08:00
62b698dc59 update 订单逻辑改造工厂模式
(cherry picked from commit bbf2e914f1)
2023-09-02 15:08:02 +08:00
bbf2e914f1 update 订单逻辑改造工厂模式 2023-09-02 11:09:11 +08:00
32597db1ba update 订单逻辑改造工厂模式 2023-09-01 17:33:32 +08:00
45af011278 update 订单逻辑改造工厂模式 2023-09-01 17:29:59 +08:00
c2be91227b update 充值余额 新方法 2023-09-01 17:01:05 +08:00
74e97e2671 update 订单逻辑改造工厂模式 2023-09-01 16:14:04 +08:00
fbe64887f5 update 订单逻辑改造工厂模式 2023-09-01 15:45:04 +08:00
fbe05c8c6b update订单逻辑改造工厂模式 2023-09-01 15:27:50 +08:00
66a5ccd5c0 update订单逻辑改造工厂模式 2023-09-01 15:08:31 +08:00
542841042c update订单逻辑改造工厂模式 2023-09-01 15:02:54 +08:00
9366841a98 update订单逻辑改造工厂模式 2023-09-01 14:56:45 +08:00