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
23 Nov, 2016
7 commits
  • update
    c9e2ea96
    潘钊 authored
    2016-11-23 16:17:07 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
      701de6e7
    潘钊 authored
    2016-11-23 16:13:26 +0800  
    Browse Code »
  • update
    29f78d10
    潘钊 authored
    2016-11-23 16:13:13 +0800  
    Browse Code »
  • update
    b95b07c2
    潘钊 authored
    2016-11-23 16:12:05 +0800  
    Browse Code »
  • Merge branch 'PSM-12' into minhang
      c681de6f
    徐烜 authored
    2016-11-23 15:48:59 +0800  
    Browse Code »
  • PSM-12
    2b60874c
    徐烜 authored
    2016-11-23 15:46:09 +0800  
    Browse Code »
  • update
      11aba068
    潘钊 authored
    2016-11-23 15:39:16 +0800  
    Browse Code »

22 Nov, 2016
10 commits
  • update
      1752b835
    潘钊 authored
    2016-11-22 21:52:51 +0800  
    Browse Code »
  • update
    8e5ce013
    潘钊 authored
    2016-11-22 21:52:44 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang ...
      11a38ebd
    # Conflicts:
    #	src/main/resources/static/real_control_v2/mapmonitor/fragments/map_config.html
    #	src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
    潘钊 authored
    2016-11-22 21:52:07 +0800  
    Browse Code »
  • update...
    50520c7f
    潘钊 authored
    2016-11-22 21:43:20 +0800  
    Browse Code »
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      f143d547
    minhang
    
    # Conflicts:
    #	src/main/resources/static/pages/forms/statement/waybill.html
    廖磊 authored
    2016-11-22 17:37:08 +0800  
    Browse Code »
  • 报表
    483f22c7
    廖磊 authored
    2016-11-22 17:34:43 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang ...
      7821e6c0
    # Conflicts:
    #	src/main/resources/static/real_control_v2/mapmonitor/fragments/map_config.html
    #	src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
    潘钊 authored
    2016-11-22 15:39:26 +0800  
    Browse Code »
  • 加入分公司数据权限
    e204a0f4
    潘钊 authored
    2016-11-22 15:35:00 +0800  
    Browse Code »
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      29949ba6
    minhang
    廖磊 authored
    2016-11-22 09:58:42 +0800  
    Browse Code »
  • 报表
    d7ad331b
    廖磊 authored
    2016-11-22 09:56:59 +0800  
    Browse Code »

20 Nov, 2016
1 commit
  • update
      7eaee329
    潘钊 authored
    2016-11-20 22:55:27 +0800  
    Browse Code »

18 Nov, 2016
15 commits
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      01cc9e07
    minhang
    廖磊 authored
    2016-11-18 12:48:46 +0800  
    Browse Code »
  • 加油
    7a5d836e
    廖磊 authored
    2016-11-18 12:47:48 +0800  
    Browse Code »
  • update
      3f2010fd
    潘钊 authored
    2016-11-18 12:21:38 +0800  
    Browse Code »
  • update
    c5af1825
    潘钊 authored
    2016-11-18 12:21:24 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
      5661f111
    潘钊 authored
    2016-11-18 12:18:52 +0800  
    Browse Code »
  • update
    5db0424d
    潘钊 authored
    2016-11-18 12:18:23 +0800  
    Browse Code »
  • 去编辑按钮
      bdde7b0f
    廖磊 authored
    2016-11-18 11:00:02 +0800  
    Browse Code »
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      b1be6591
    minhang
    廖磊 authored
    2016-11-18 10:26:20 +0800  
    Browse Code »
  • 油量
    bdb9289e
    廖磊 authored
    2016-11-18 10:25:28 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
      08d4195a
    潘钊 authored
    2016-11-18 10:03:25 +0800  
    Browse Code »
  • 帮周勤提交一下代码
    af4c8c90
    潘钊 authored
    2016-11-18 10:02:33 +0800  
    Browse Code »
  • Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into ...
      795b4905
    minhang
    廖磊 authored
    2016-11-18 09:11:16 +0800  
    Browse Code »
  • 报表
    d63cf921
    廖磊 authored
    2016-11-18 09:09:30 +0800  
    Browse Code »
  • 注释掉 spring-boot-devtools ...
      40d6caca
    该配置会导致浏览器静态资源缓存失效
    潘钊 authored
    2016-11-18 04:14:50 +0800  
    Browse Code »
  • update
      268615d2
    潘钊 authored
    2016-11-18 01:09:32 +0800  
    Browse Code »

17 Nov, 2016
7 commits
  • update
      b44408ba
    潘钊 authored
    2016-11-17 16:40:07 +0800  
    Browse Code »
  • Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
      14886461
    潘钊 authored
    2016-11-17 16:38:47 +0800  
    Browse Code »
  • update
    933f4e6a
    潘钊 authored
    2016-11-17 16:38:38 +0800  
    Browse Code »
  • Merge branch 'PSM-12' into minhang
      75699f96
    徐烜 authored
    2016-11-17 12:39:29 +0800  
    Browse Code »
  • PSM-12
    2911e54c
    徐烜 authored
    2016-11-17 12:38:54 +0800  
    Browse Code »
  • 基础信息页面bug修复
      f26ff853
    李强 authored
    2016-11-17 12:22:58 +0800  
    Browse Code »
  • Merge branch 'PSM-12' into minhang
      946d0265
    徐烜 authored
    2016-11-17 10:33:20 +0800  
    Browse Code »