潘钊 / bsth_control · Commits

06 Feb, 2018

37 commits

Merge branch 'pudong' into jiading ...

# Conflicts:
#	src/main/java/com/bsth/controller/BusIntervalController.java
#	src/main/java/com/bsth/service/BusIntervalService.java
#	src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
#	src/main/resources/ms-jdbc.properties

authored

2018-02-06 21:38:30 +0800

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong
031c9662

潘钊 authored
2018-02-06 16:32:34 +0800
Browse Code »
update..
b2439e42

潘钊 authored
2018-02-06 16:32:23 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
78adddad

娄高锋 authored
2018-02-06 16:04:05 +0800
Browse Code »
update
d5311bc4

娄高锋 authored
2018-02-06 16:03:51 +0800
Browse Code »
车载上报停靠站添加查询日志
8b2fab5f

zlz authored
2018-02-06 15:58:22 +0800
Browse Code »
Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong
59b6e7d4

徐烜 authored
2018-02-06 15:43:20 +0800
Browse Code »
修改车辆设备信息管理功能v1.1 ...
fe0bfcce
```
1、添加车辆设备信息，启用日期加required，修改required错误提示
```
徐烜 authored
2018-02-06 15:43:14 +0800
Browse Code »
update..
50ebd417

潘钊 authored
2018-02-06 15:05:40 +0800
Browse Code »
update..
b36c6890

潘钊 authored
2018-02-06 13:51:17 +0800
Browse Code »
update
97aaff6d

娄高锋 authored
2018-02-06 12:57:22 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
272d4e31

娄高锋 authored
2018-02-06 12:41:34 +0800
Browse Code »
update..
4c01d24c

潘钊 authored
2018-02-06 12:19:29 +0800
Browse Code »
update..
bdd4ceae

潘钊 authored
2018-02-06 12:07:49 +0800
Browse Code »
update..
d41ad460

潘钊 authored
2018-02-06 12:04:46 +0800
Browse Code »
update..
93e887ff

潘钊 authored
2018-02-06 11:52:59 +0800
Browse Code »
update
02ea4ad9

娄高锋 authored
2018-02-06 11:30:54 +0800
Browse Code »
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong
753eca44

潘钊 authored
2018-02-06 11:17:55 +0800
Browse Code »
update..
1f7618d4

潘钊 authored
2018-02-06 11:17:32 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
ff91a433

娄高锋 authored
2018-02-06 10:56:08 +0800
Browse Code »
发车到站准点率快1慢3
2e61fd8c

娄高锋 authored
2018-02-06 10:54:29 +0800
Browse Code »
update..
f1a266a5

潘钊 authored
2018-02-06 10:47:18 +0800
Browse Code »
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control ...
1098be8f
```
into pudong
```
廖磊 authored
2018-02-06 10:44:53 +0800
Browse Code »
到离站页面修改
ceddcf9e

廖磊 authored
2018-02-06 10:43:51 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
d2cfd47b

娄高锋 authored
2018-02-06 10:36:30 +0800
Browse Code »
update
6ee8d19a

娄高锋 authored
2018-02-06 10:35:50 +0800
Browse Code »
update..
5d368621

潘钊 authored
2018-02-06 10:30:13 +0800
Browse Code »
Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong
ee992a2e

游瑞烽 authored
2018-02-06 10:15:48 +0800
Browse Code »
版本页面修改
bf86488c

游瑞烽 authored
2018-02-06 10:10:18 +0800
Browse Code »
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong
00efc540

潘钊 authored
2018-02-06 10:08:06 +0800
Browse Code »
update..
1ce420d6

潘钊 authored
2018-02-06 10:05:07 +0800
Browse Code »
update..
1d3d241f

潘钊 authored
2018-02-06 10:00:36 +0800
Browse Code »
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control ...
e9991cac
```
into pudong
```
廖磊 authored
2018-02-06 09:23:57 +0800
Browse Code »
新增售票员统计导出
ba0cb3df

廖磊 authored
2018-02-06 09:21:38 +0800
Browse Code »
新增统计售票员公里的方法
077cb3e6

廖磊 authored
2018-02-06 09:19:12 +0800
Browse Code »
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong
5309c5c5

潘钊 authored
2018-02-06 09:11:41 +0800
Browse Code »
网关数据库迁移..
b5445190

潘钊 authored
2018-02-06 09:10:53 +0800
Browse Code »

05 Feb, 2018

3 commits

update...
4e1712f7

潘钊 authored
2018-02-05 15:27:34 +0800
Browse Code »
update...
90e19e94

潘钊 authored
2018-02-05 15:00:43 +0800
Browse Code »
update
1fa133bd

娄高锋 authored
2018-02-05 14:52:05 +0800
Browse Code »