Commits · 1c2f5184f2b611a6bc1024de0976abae6f6dcc4e · Administrator / drp

24 Mar, 2015 4 commits
- Merge remote-tracking branch 'os/custom-for-wangli' · 1c2f5184
  reedmi authored Mar 24, 2015
  
  1c2f5184
- Merge remote-tracking branch 'os/custom-for-wangli' · 6d66a531
  reedmi authored Mar 24, 2015
  
  6d66a531
- Initial commit · 77efda47
  reedmi authored Mar 24, 2015
  
  77efda47
- 删除多余的project相关 · f13bce6f
  reedmi authored Mar 24, 2015
  
  f13bce6f
18 Mar, 2015 16 commits
- Merge remote-tracking branch 'origin/custom-for-wangli' into custom-for-wangli · 4365dd18
  reedmi authored Mar 18, 2015
  
  4365dd18
- 加入友好的数据显示 · 5f1cfac2
  reedmi authored Mar 18, 2015
  
  5f1cfac2
- Merge branch 'custom-for-wangli' of http://182.92.242.253/originstar/drp.git into custom-for-wangli · 5764b911
  Junshan Wang authored Mar 18, 2015
  
  5764b911
- 页面版权 · 2096b784
  Junshan Wang authored Mar 18, 2015
  
  2096b784
- 解决出库单与入库单的冲突问题 · f2a829ce
  reedmi authored Mar 18, 2015
  
  f2a829ce
- 完善小功能 · 2c69c296
  reedmi authored Mar 18, 2015
  
  2c69c296
- Merge remote-tracking branch 'origin/custom-for-wangli' into custom-for-wangli · 861c4133
  reedmi authored Mar 18, 2015
  
  861c4133
- fix some errors · b83ff073
  reedmi authored Mar 18, 2015
  
  b83ff073
- Merge branch 'custom-for-wangli' of 182.92.242.253:originstar/drp into custom-for-wangli · 57bf2fd7
  tangqh authored Mar 18, 2015
  
  57bf2fd7
- 实时库存导出为excel · 3834774b
  tangqh authored Mar 18, 2015
  
  3834774b
- 初步完成出库单 · 419b27f1
  reedmi authored Mar 18, 2015
  
  419b27f1
- Merge remote-tracking branch 'origin/custom-for-wangli' into custom-for-wangli · 4e2b7d12
  reedmi authored Mar 18, 2015
  
  4e2b7d12
- 完善商品添加 · e8351fcb
  reedmi authored Mar 18, 2015
  
  e8351fcb
- 用colume(nullable=false)代替@Notnull注解 · d3bfe846
  Yonggang Yuan authored Mar 18, 2015
  
  d3bfe846
- Merge branch 'custom-for-wangli' of git@182.92.242.253:originstar/drp.git into custom-for-wangli · 853128f1
  Yonggang Yuan authored Mar 18, 2015
  
  853128f1
- 实时库存数据导出UI · 209a09f7
  Yonggang Yuan authored Mar 18, 2015
  
  209a09f7
17 Mar, 2015 20 commits
- 初步完成入库单 · 293ad776
  reedmi authored Mar 17, 2015
  
  293ad776
- 去除多余的资源文件 · bf805bbe
  reedmi authored Mar 17, 2015
  
  bf805bbe
- Merge remote-tracking branch 'origin/custom-for-wangli' into custom-for-wangli · fefc3113
  reedmi authored Mar 17, 2015
  
  fefc3113
- 加入wareform默认填充值 · d669168d
  reedmi authored Mar 17, 2015
  
  d669168d
- Merge branch 'custom-for-wangli' of http://182.92.242.253/originstar/drp.git into custom-for-wangli · e5d4116b
  Junshan Wang authored Mar 17, 2015
  
  e5d4116b
- 完善登陆界面 · 3e0a2a5c
  Junshan Wang authored Mar 17, 2015
  
  3e0a2a5c
- Merge remote-tracking branch 'origin/custom-for-wangli' into custom-for-wangli · 8689a575
  reedmi authored Mar 17, 2015
  
  8689a575
- 完成实时库存查看 · da1c9307
  reedmi authored Mar 17, 2015
  
  da1c9307
- 修改并测试用户管理部分 · b4c4de23
  Yonggang Yuan authored Mar 17, 2015
  
  b4c4de23
- tmp · b4baa21f
  Junshan Wang authored Mar 17, 2015
  
  b4baa21f
- 添加初始化脚本 · f759ed43
  reedmi authored Mar 17, 2015
  
  f759ed43
- Merge remote-tracking branch 'origin/master' · 6744037d
  reedmi authored Mar 17, 2015
  
  6744037d
- 完善商品分类 · 147b8035
  reedmi authored Mar 17, 2015
  
  147b8035
- 修改jdbc.properties · ab1d724f
  Junshan Wang authored Mar 17, 2015
  
  ab1d724f
- Merge branch 'master' of git@182.92.242.253:originstar/drp.git · c7b25093
  Yonggang Yuan authored Mar 17, 2015
  
  c7b25093
- Merge branch 'master' of git@182.92.242.253:originstar/drp.git · a9ecd600
  Yonggang Yuan authored Mar 17, 2015
```
Conflicts:
	src/main/resources/jdbc.properties
```
  a9ecd600
- 规范service · e7aeabf1
  reedmi authored Mar 17, 2015
  
  e7aeabf1
- 添加开发和生产环境的配置切换 · f7ac3155
  Yonggang Yuan authored Mar 17, 2015
  
  f7ac3155
- 稳定项目结构 · b5928951
  reedmi authored Mar 17, 2015
  
  b5928951
- Merge branch 'refine-code-to-support-maven' into 'master' · 1c97167c
  sdcsyyg authored Mar 17, 2015
```
Refine code to support maven

See merge request !1
```
  1c97167c