|
|
a6fb166e09
|
Merge branch 'dev' into HuiFu
# Conflicts:
# jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
# jsowell-admin/src/test/java/SpringBootTestController.java
|
2023-05-17 16:43:07 +08:00 |
|
|
|
22a54aab7f
|
添加汇付支付回调接口
|
2023-05-17 10:14:15 +08:00 |
|
Lemon
|
7b2a3fe20e
|
add 推送联联平台设备状态变更接口
|
2023-05-16 15:04:08 +08:00 |
|
|
|
87666032b2
|
Merge branch 'dev' into HuiFu
|
2023-05-16 14:22:34 +08:00 |
|
Lemon
|
dd6396e9c9
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
# jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java
|
2023-05-15 10:30:53 +08:00 |
|
Lemon
|
fb260eb68d
|
update 联联平台接口
|
2023-05-15 10:30:16 +08:00 |
|
|
|
ea6be0da90
|
Merge branch 'dev' into HuiFu
|
2023-05-15 08:22:10 +08:00 |
|
|
|
dd59ce9348
|
update 查询首页数据
|
2023-05-13 17:51:16 +08:00 |
|
|
|
42d206e446
|
update 查询首页数据
|
2023-05-13 17:41:05 +08:00 |
|
|
|
3f8405d3d2
|
update 加日志
|
2023-05-13 17:19:10 +08:00 |
|
|
|
8713d82961
|
update 优化订单金额展示
|
2023-05-12 15:03:29 +08:00 |
|
|
|
93f48823ab
|
update 开票详情页面
|
2023-05-12 11:37:45 +08:00 |
|
|
|
92b595b324
|
update 开票详情页面
|
2023-05-12 11:21:13 +08:00 |
|
|
|
162e6c1d3b
|
update huifu
|
2023-05-11 16:45:44 +08:00 |
|
|
|
54d0f728c4
|
update huifu
|
2023-05-11 16:37:41 +08:00 |
|
|
|
61c6d1b486
|
update huifu
|
2023-05-11 15:39:15 +08:00 |
|
|
|
2ef229e50c
|
Merge branch 'dev' into HuiFu
# Conflicts:
# jsowell-admin/src/test/java/SpringBootTestController.java
# jsowell-pile/pom.xml
|
2023-05-11 15:00:36 +08:00 |
|
|
|
e50be067ae
|
update订单实时数据保存到数据库
|
2023-05-10 16:39:55 +08:00 |
|
|
|
4738a7b0ce
|
订单实时数据保存到数据库
|
2023-05-10 16:34:56 +08:00 |
|
|
|
5c1c3777a7
|
update
|
2023-05-10 16:06:53 +08:00 |
|
|
|
4a753f7656
|
订单实时数据保存到数据库
|
2023-05-10 16:03:11 +08:00 |
|
|
|
11240e08dc
|
订单实时数据保存到数据库
|
2023-05-10 15:38:24 +08:00 |
|
|
|
92610695b2
|
update
|
2023-05-10 15:19:34 +08:00 |
|
|
|
9f2537f82d
|
update 订单实时记录
|
2023-05-10 15:13:07 +08:00 |
|
|
|
fb768cd7a2
|
update 订单实时记录
|
2023-05-10 15:02:43 +08:00 |
|
|
|
daa178b87a
|
订单实时记录
|
2023-05-10 15:01:29 +08:00 |
|
|
|
8489e175fd
|
update
|
2023-05-10 14:53:06 +08:00 |
|
|
|
16956330eb
|
update 修改充电站名称同步修改组织信息
|
2023-05-10 14:47:03 +08:00 |
|
|
|
e2c250a494
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-05-10 08:51:19 +08:00 |
|
|
|
f482f71007
|
update
(cherry picked from commit 0bb109f523)
|
2023-05-10 08:50:52 +08:00 |
|
|
|
9215dd458f
|
update 站点基本资料
(cherry picked from commit e5fa93ed9f)
|
2023-05-10 08:50:42 +08:00 |
|
|
|
0bb109f523
|
update
|
2023-05-10 08:50:19 +08:00 |
|
Lemon
|
d2eed9ad3a
|
add 联联平台相关工具类
|
2023-05-10 08:49:01 +08:00 |
|
|
|
e5fa93ed9f
|
update 站点基本资料
|
2023-05-10 08:40:20 +08:00 |
|
|
|
a045fe9315
|
update
|
2023-05-10 08:19:44 +08:00 |
|
|
|
818b9177ba
|
update 包名
|
2023-05-09 11:39:54 +08:00 |
|
|
|
4b81a9b28c
|
Merge branch 'dev' into HuiFu
|
2023-05-09 11:34:41 +08:00 |
|
|
|
e2d7c984c4
|
update 查询会员sql
|
2023-05-06 17:05:20 +08:00 |
|
|
|
4e97caf912
|
update 防止会员id重复
|
2023-05-06 16:02:25 +08:00 |
|
|
|
42dd503de3
|
修改启动方式枚举描述
|
2023-05-06 15:42:20 +08:00 |
|
Lemon
|
f75e32d4f4
|
update
|
2023-05-06 09:20:46 +08:00 |
|
|
|
c2e5784caa
|
update 订单详情 new收费明细
|
2023-05-05 16:46:43 +08:00 |
|
|
|
4ea0f8d562
|
update 快速建站，加事务
|
2023-05-05 11:21:31 +08:00 |
|
|
|
8a775b93c6
|
update 清除订单缓存
|
2023-05-04 15:20:33 +08:00 |
|
Lemon
|
6c5c72034c
|
add 联联平台 请求启动充电 接口
|
2023-04-29 10:33:16 +08:00 |
|
|
|
b9f29d5179
|
update 图片上传
|
2023-04-28 14:35:35 +08:00 |
|
|
|
36561d6169
|
update 汇付
|
2023-04-27 09:53:25 +08:00 |
|
Lemon
|
ea34f51849
|
add 联联平台请求停止充电接口
|
2023-04-25 14:03:09 +08:00 |
|
Lemon
|
c584ff91f4
|
联联平台 查询充电状态接口
|
2023-04-25 11:20:43 +08:00 |
|
|
|
72a856ee7b
|
Merge branch 'dev' into HuiFu
|
2023-04-24 15:25:28 +08:00 |
|
