Commits · 8334e5d9f8a38f5ab85fd5825b42f0bdf7103302 · 首航-临时账号 / api

24 Sep, 2019 30 commits
- Merge remote-tracking branch 'origin/develop' into develop · 8334e5d9
```
# Conflicts:
#	resources/redis.properties
#	src/com/ejweb/modules/user/api/UserController.java
```
  java-李谡 committed Sep 24, 2019
  8334e5d9 Browse Files
- 添加redis方法 · 91096a14
  java-李谡 committed Sep 24, 2019
  
  91096a14 Browse Files
- 登陆修改 · 09eff4d9
  zhangyu committed Sep 24, 2019
  
  09eff4d9 Browse Files
- 登陆修改 · f13c2468
  zhangyu committed Sep 24, 2019
  
  f13c2468 Browse Files
- 添加redis方法 · c4499914
  java-李谡 committed Sep 24, 2019
  
  c4499914 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 7815b27c
  zhangyu committed Sep 24, 2019
  
  7815b27c Browse Files
- 登陆修改 · c48f1ff7
  zhangyu committed Sep 24, 2019
  
  c48f1ff7 Browse Files
- 修改ip限制 · beec0d2b
  zt committed Sep 24, 2019
  
  beec0d2b Browse Files
- 修改sql · 2b987f30
  zt committed Sep 24, 2019
  
  2b987f30 Browse Files
- 登陆修改 · edb58868
  zhangyu committed Sep 24, 2019
  
  edb58868 Browse Files
- 登陆修改 · 46b4e907
  zhangyu committed Sep 24, 2019
  
  46b4e907 Browse Files
- 修改sql · 11be1cd4
  zt committed Sep 24, 2019
  
  11be1cd4 Browse Files
- 登陆修改 · 38494007
  zhangyu committed Sep 24, 2019
  
  38494007 Browse Files
- 修改 · 38a9d286
  zt committed Sep 24, 2019
  
  38a9d286 Browse Files
- 修改 · 9ba83753
  zt committed Sep 24, 2019
  
  9ba83753 Browse Files
- 修改 · 4f332398
  zt committed Sep 24, 2019
  
  4f332398 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 988347dd
  zt committed Sep 24, 2019
  
  988347dd Browse Files
- 修改redis key的条件判断 · 96003026
  zt committed Sep 24, 2019
  
  96003026 Browse Files
- 登陆修改 · d07bc193
  zhangyu committed Sep 24, 2019
  
  d07bc193 Browse Files
- 修改 · fda6bb53
  zt committed Sep 24, 2019
  
  fda6bb53 Browse Files
- 添加redis方法 · b8e6774e
  java-李谡 committed Sep 24, 2019
  
  b8e6774e Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · fe89cc89
```
# Conflicts:
#	src/com/ejweb/modules/user/api/UserController.java
```
  java-李谡 committed Sep 24, 2019
  fe89cc89 Browse Files
- Merge remote-tracking branch 'origin/dev-zt' into develop · cbf8478b
  java-李谡 committed Sep 24, 2019
  
  cbf8478b Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 5fd530f7
  zhangyu committed Sep 24, 2019
  
  5fd530f7 Browse Files
- Delete jedis-2.9.0.jar · b7881d9b
  zhangyu committed Sep 24, 2019
  
  b7881d9b Browse Files
- 登陆修改 · 225607a0
  zhangyu committed Sep 24, 2019
  
  225607a0 Browse Files
- 登陆修改 · 3613b61a
  zhangyu committed Sep 24, 2019
  
  3613b61a Browse Files
- 修改 · 8b98afac
  zt committed Sep 24, 2019
  
  8b98afac Browse Files
- 修改 · e4d56bbc
  zt committed Sep 24, 2019
  
  e4d56bbc Browse Files
- Merge branch 'develop' into 'dev-zt' · 78042c55
```
合并

See merge request java-jdair-foc/foc-api-2.0!3
```
  zangtao committed Sep 24, 2019
  78042c55 Browse Files
23 Sep, 2019 8 commits
- 修改 · 0baf3320
  zt committed Sep 23, 2019
  
  0baf3320 Browse Files
- 修改 · 0f7adddc
  zt committed Sep 23, 2019
  
  0f7adddc Browse Files
- 修改 · 6753e606
  zt committed Sep 23, 2019
  
  6753e606 Browse Files
- 添加redis方法 · 49d72078
  java-李谡 committed Sep 23, 2019
  
  49d72078 Browse Files
- Merge branch 'develop' into 'dev-zt' · f7650884
```
添加redis依赖

See merge request java-jdair-foc/foc-api-2.0!2
```
  zangtao committed Sep 23, 2019
  f7650884 Browse Files
- 添加redis依赖 · bd35191b
  java-李谡 committed Sep 23, 2019
  
  bd35191b Browse Files
- 添加redis依赖 · d58bba2b
  java-李谡 committed Sep 23, 2019
  
  d58bba2b Browse Files
- 添加redis依赖 · 721e1946
  java-李谡 committed Sep 23, 2019
  
  721e1946 Browse Files
19 Aug, 2019 1 commit
- 修改系统消息，论证终止或论证成功仍然显示 · 459ffb43
  java-李谡 committed Aug 19, 2019
  
  459ffb43 Browse Files
04 Jun, 2019 1 commit
- 部门论证添加备注节点 · c3a147f6
  java-李谡 committed Jun 04, 2019
  
  c3a147f6 Browse Files