Sign in

潘钊 / bsth_control · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 687
  • Compare
  • Branches 33
  • Tags 2
  • bsth_control
10 Nov, 2016
1 commit
  • update....
      cbfe66b5
    潘钊 authored
    2016-11-10 01:03:07 +0800  
    Browse Code »

09 Nov, 2016
3 commits
  • 报表
      ffe8c7f0
    廖磊 authored
    2016-11-09 17:28:09 +0800  
    Browse Code »
  • PSM-14
      536ffe46
    徐烜 authored
    2016-11-09 17:05:57 +0800  
    Browse Code »
  • PSM-14
    5e99b8a6
    徐烜 authored
    2016-11-09 16:54:52 +0800  
    Browse Code »

08 Nov, 2016
3 commits
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      955475db
    minhang
    
    # Conflicts:
    #	src/main/java/com/bsth/data/schedule/DayOfSchedule.java
    #	src/main/resources/static/assets/plugins/fileinput/fileinput.min.js
    #	src/main/resources/static/assets/plugins/fileinput/purify.min.js
    #	src/main/resources/static/assets/plugins/fileinput/sortable.min.js
    #	src/main/resources/static/real_control_v2/fragments/north/nav/tts_config.html
    #	src/main/resources/static/real_control_v2/js/utils/tts.js
    廖磊 authored
    2016-11-08 17:19:54 +0800  
    Browse Code »
  • 报表
    d32f9c89
    廖磊 authored
    2016-11-08 16:59:58 +0800  
    Browse Code »
  • 报表
    d0d05b4d
    廖磊 authored
    2016-11-08 16:47:07 +0800  
    Browse Code »

07 Nov, 2016
10 commits
  • Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang
      57ed9773
    王通 authored
    2016-11-07 16:36:40 +0800  
    Browse Code »
  • 线路信息里添加报表需要的两个字段<权证配车数 权证配车启用日期>
      3fb94562
    李强 authored
    2016-11-07 11:08:22 +0800  
    Browse Code »
  • 添加指令收到时间,指令确认时间
      e32c3b2f
    潘钊 authored
    2016-11-07 10:37:44 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into minhang
    7a36acc0
    王通 authored
    2016-11-07 08:53:46 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
      5e56f6a1
    潘钊 authored
    2016-11-07 00:43:52 +0800  
    Browse Code »
  • add tts
    24841876
    潘钊 authored
    2016-11-07 00:43:41 +0800  
    Browse Code »
  • add tts模块, 加入班次搜索框
    8de956dc
    潘钊 authored
    2016-11-07 00:42:21 +0800  
    Browse Code »
  • 更新配置文件....
    64d242d5
    潘钊 authored
    2016-11-07 00:41:29 +0800  
    Browse Code »
  • 从SimpleDateFormat 切换至 joda time
    d450dbd2
    潘钊 authored
    2016-11-07 00:41:02 +0800  
    Browse Code »
  • 从SimpleDateFormat 切换至 joda time
    c5bdfdce
    潘钊 authored
    2016-11-07 00:40:18 +0800  
    Browse Code »

04 Nov, 2016
10 commits
  • --车载设备接入查询
    46722a92
    王通 authored
    2016-11-04 14:10:23 +0800  
    Browse Code »
  • Merge branch 'qingpu' into minhang
      2f388904
    徐烜 authored
    2016-11-04 12:29:03 +0800  
    Browse Code »
  • PSM-18
      7195f60e
    徐烜 authored
    2016-11-04 12:27:54 +0800  
    Browse Code »
  • PSM-14
    12df3542
    徐烜 authored
    2016-11-04 09:37:29 +0800  
    Browse Code »
  • update...
      97545ae6
    潘钊 authored
    2016-11-04 02:14:14 +0800  
    Browse Code »
  • update
      46761705
    潘钊 authored
    2016-11-04 02:13:28 +0800  
    Browse Code »
  • Merge branch 'minhang' into qingpu
    49e7d85f
    潘钊 authored
    2016-11-04 01:50:28 +0800  
    Browse Code »
  • Merge branch 'qingpu' of http://222.66.0.204:8090/panzhaov5/bsth_control into qingpu
    0be39be5
    潘钊 authored
    2016-11-04 01:50:14 +0800  
    Browse Code »
  • Merge branch 'minhang' of ...
      c45e7392
    http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
    
    # Conflicts:
    #	src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
    潘钊 authored
    2016-11-04 01:49:27 +0800  
    Browse Code »
  • 优化到离站逻辑
    1a61f28c
    潘钊 authored
    2016-11-04 01:48:21 +0800  
    Browse Code »

03 Nov, 2016
12 commits
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      b27fab8e
    minhang
    
    # Conflicts:
    #	src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
    廖磊 authored
    2016-11-03 17:10:29 +0800  
    Browse Code »
  • prod
    31f784ee
    廖磊 authored
    2016-11-03 16:32:41 +0800  
    Browse Code »
  • 路单错误
    d72bedd8
    廖磊 authored
    2016-11-03 16:29:54 +0800  
    Browse Code »
  • 路单不对
    45ef9689
    廖磊 authored
    2016-11-03 16:16:21 +0800  
    Browse Code »
  • PSM-17
      7e127528
    徐烜 authored
    2016-11-03 10:30:48 +0800  
    Browse Code »
  • PSM-17
      edd43a19
    徐烜 authored
    2016-11-03 10:26:30 +0800  
    Browse Code »
  • PSM-17
    b40c9fd3
    徐烜 authored
    2016-11-03 10:23:22 +0800  
    Browse Code »
  • Merge branch 'minhang' into qingpu
    a892f325
    潘钊 authored
    2016-11-03 01:21:17 +0800  
    Browse Code »
  • ...
      b49a7d13
    潘钊 authored
    2016-11-03 01:20:48 +0800  
    Browse Code »
  • ...
      8af90812
    潘钊 authored
    2016-11-03 01:19:48 +0800  
    Browse Code »
  • Merge branch 'minhang' into qingpu
    9deae92e
    潘钊 authored
    2016-11-03 00:52:25 +0800  
    Browse Code »
  • 到离站逻辑优化
    ed598730
    潘钊 authored
    2016-11-03 00:52:01 +0800  
    Browse Code »

02 Nov, 2016
1 commit
  • Merge branch 'minhang' into qingpu ...
    d80b9172
    # Conflicts:
    #	src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
    潘钊 authored
    2016-11-02 23:20:06 +0800  
    Browse Code »