Commits | b4634acb81a42f736e3330be8cd08fa2eae92177 | 潘钊 / bsth_control

07 Jan, 2021

6 commits

Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8
b4634acb

娄高锋 authored
2021-01-07 17:50:56 +0800
Browse Code »
group by 加上缺少的字段
92dc3b45

娄高锋 authored
2021-01-07 17:50:09 +0800
Browse Code »

Merge branch 'pudong' into pudong_jdk8 ...

# Conflicts:
#	src/main/java/com/bsth/data/report_register/entity/ReportRegister.java
#	src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java

authored

2021-01-07 17:35:58 +0800

Browse Code »

Merge branch 'pudong' into pudong_jdk8 ...

f5fa0e8d

# Conflicts:
#	src/main/java/com/bsth/data/report_register/entity/ReportRegister.java
#	src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java

authored

2021-01-07 17:34:12 +0800

Browse Code »

1.行车路单、服务热线上报修正
93705193

王通 authored
2021-01-07 17:14:32 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8 ...
07506aa1
```
# Conflicts:
#	src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
```
王通 authored
2021-01-07 09:28:23 +0800
Browse Code »

06 Jan, 2021

12 commits

1.
caa62f01

王通 authored
2021-01-06 17:08:07 +0800
Browse Code »
修复路单数据汇总表中是否电车选项无效的问题
c6dc0b52

娄高锋 authored
2021-01-06 16:27:55 +0800
Browse Code »
1.PredicatesBuilder in条件表达式修正
61cfd0d6

王通 authored
2021-01-06 16:11:43 +0800
Browse Code »
1.
643f5349

王通 authored
2021-01-06 15:20:47 +0800
Browse Code »
1.
76737007

王通 authored
2021-01-06 15:15:49 +0800
Browse Code »
统计公式优化
2eff389e

娄高锋 authored
2021-01-06 15:12:04 +0800
Browse Code »
1.
c5f5bfc1

王通 authored
2021-01-06 15:07:57 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
a20368b4

娄高锋 authored
2021-01-06 14:56:50 +0800
Browse Code »
1.
c3120590

王通 authored
2021-01-06 14:51:02 +0800
Browse Code »
1.home.html更新日志
cffa9aa1

王通 authored
2021-01-06 14:45:17 +0800
Browse Code »
取消报备类型“绕改道”的隐藏
820a289f

娄高锋 authored
2021-01-06 14:25:37 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8
19d02e24

王通 authored
2021-01-06 12:58:02 +0800
Browse Code »

28 Dec, 2020

1 commit

ftp上传换成站点路由名称
ce666444

游瑞烽 authored
2020-12-28 14:41:32 +0800
Browse Code »

23 Dec, 2020

1 commit

1.增加jpa配置项
1576d2a8

王通 authored
2020-12-23 13:01:54 +0800
Browse Code »

21 Dec, 2020

4 commits

路单详情添加线路性质筛选条件
b393aa20

游瑞烽 authored
2020-12-21 16:25:50 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8 ...
3e6c0fc5
```
# Conflicts:
#	src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
```
游瑞烽 authored
2020-12-21 15:38:36 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
f7de1d19

游瑞烽 authored
2020-12-21 15:34:37 +0800
Browse Code »
路单详情报表修改格式
514e44d5

游瑞烽 authored
2020-12-21 15:34:18 +0800
Browse Code »

08 Dec, 2020

3 commits

Merge branch 'pudong' into pudong_jdk8 ...
8fd41b90
```
# Conflicts:
#	src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
```
王通 authored
2020-12-08 15:55:00 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8 ...
6e116423
```
# Conflicts:
#	src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
```
王通 authored
2020-12-08 15:52:08 +0800
Browse Code »
1.电子路单上传加入重试机制
2793b1ce

王通 authored
2020-12-08 15:42:36 +0800
Browse Code »

02 Dec, 2020

4 commits

1.rfid日志信息
efefc049

王通 authored
2020-12-02 17:09:53 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8
100ef353

王通 authored
2020-12-02 17:08:40 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
6e47d285

游瑞烽 authored
2020-12-02 10:50:28 +0800
Browse Code »
update
019440d0

游瑞烽 authored
2020-12-02 10:50:02 +0800
Browse Code »

01 Dec, 2020

7 commits

rfid线路签卡率报表页面去掉debugger;
88c8dc71

ljq authored
2020-12-01 16:18:47 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8
1a3f1987

王通 authored
2020-12-01 14:12:21 +0800
Browse Code »
rfid线路签卡率报表
0d0e8203

ljq authored
2020-12-01 13:58:21 +0800
Browse Code »
1.rfid图例样式修正
40cea76b

王通 authored
2020-12-01 13:32:27 +0800
Browse Code »
Merge branch 'pudong' into pudong_jdk8
3f0eefe9

王通 authored
2020-12-01 12:20:14 +0800
Browse Code »
1.merge pudong分支
82767007

王通 authored
2020-12-01 12:19:38 +0800
Browse Code »
1.rfid逻辑变更，加rfid状态列造成某些功能异常
480b5411

王通 authored
2020-12-01 10:59:30 +0800
Browse Code »

30 Nov, 2020

2 commits

Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
33403032

娄高锋 authored
2020-11-30 10:41:28 +0800
Browse Code »
update
2894f364

娄高锋 authored
2020-11-30 10:40:56 +0800
Browse Code »

潘钊 / bsth_control · Commits

GitLab