Commits · 487db2acf7f717f29739fbcfbe6e719ec3e64908 · youjj / cloud-platform

13 Mar, 2020 5 commits
- Merge branch 'violations-bug-fix' into dev · 487db2ac
  libin authored Mar 13, 2020
  
  487db2ac
- 修复违章记录查询保存bug · 1603a56f
  libin authored Mar 13, 2020
  
  1603a56f
- Merge branch 'master-tour' into dev · a586e1df
  jiaorz authored Mar 13, 2020
```
# Conflicts:
#	xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml
```
  a586e1df
- 邮箱授权码修改 · 5e892bf4
  jiaorz authored Mar 13, 2020
  
  5e892bf4
- 邮箱授权码修改 · 544da068
  jiaorz authored Mar 13, 2020
  
  544da068
09 Mar, 2020 1 commit
- 修改pom · 9d826be5
  周健威 authored Mar 09, 2020
  
  9d826be5
03 Mar, 2020 6 commits
- 修改保留日志天数 · 85b2b7df
  周健威 authored Mar 03, 2020
  
  85b2b7df
- 邮箱授权码修改 · 7d8a9664
  jiaorz authored Mar 03, 2020
  
  7d8a9664
- Merge remote-tracking branch 'origin/dev' into dev · 32c461c8
  jiaorz authored Mar 03, 2020
  
  32c461c8
- Merge branch 'master-email' into dev · ac0a4c56
  jiaorz authored Mar 03, 2020
  
  ac0a4c56
- 邮箱授权码修改 · af5a35ae
  jiaorz authored Mar 03, 2020
  
  af5a35ae
- 邮箱授权码修改 · 9b21ecaa
  jiaorz authored Mar 03, 2020
  
  9b21ecaa
23 Feb, 2020 2 commits
- Merge branch 'master_0223' into dev · 06655c46
  hezhen authored Feb 23, 2020
  
  06655c46
- 123 · 2d10174e
  hezhen authored Feb 23, 2020
  
  2d10174e
24 Jan, 2020 1 commit
- 放开注册和会员购买 · 06dc017c
  xiaosl authored Jan 24, 2020
  
  06dc017c
17 Jan, 2020 12 commits
- Merge branch 'master_admin0117' into master2 · 8c5e6968
  hanfeng authored Jan 17, 2020
  
  8c5e6968
- Merge remote-tracking branch 'origin/master' into master2 · 859fabc4
  hanfeng authored Jan 17, 2020
  
  859fabc4
- Merge branch 'master_admin0117' into dev · 7259611c
  hanfeng authored Jan 17, 2020
  
  7259611c
- Merge remote-tracking branch 'origin/master_admin0117' into master_admin0117 · 0e149868
  hanfeng authored Jan 17, 2020
  
  0e149868
- Merge remote-tracking branch 'origin/dev' into dev · d8a9e9d7
  hanfeng authored Jan 17, 2020
  
  d8a9e9d7
- Merge branch 'master_admin0117' into dev · 684e6e30
  hanfeng authored Jan 17, 2020
  
  684e6e30
- 开票 · 19ed2228
  hanfeng authored Jan 17, 2020
  
  19ed2228
- 开票 · 0ff28b77
  hanfeng authored Jan 17, 2020
  
  0ff28b77
- 1Merge branch 'master_admin0117' into dev · c1e8f187
  hezhen authored Jan 17, 2020
```
# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
```
  c1e8f187
- Merge branch 'master_admin0117' of... · 1c5a91d2
  hezhen authored Jan 17, 2020
```
Merge branch 'master_admin0117' of http://113.105.137.151:22280/youjj/cloud-platform into master_admin0117
```
  1c5a91d2
- 123 · 26990723
  hezhen authored Jan 17, 2020
  
  26990723
- 开票 · 4e1cef72
  hanfeng authored Jan 17, 2020
  
  4e1cef72
15 Jan, 2020 5 commits
- Merge branch 'app-version-mark' into dev · ea0ee662
  zuoyh authored Jan 15, 2020
  
  ea0ee662
- APP版本标识功能 · a684f244
  zuoyh authored Jan 15, 2020
```
修改：更新功能增加判断标识是否存在
```
  a684f244
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 805e4000
  hezhen authored Jan 15, 2020
  
  805e4000
- Merge branch 'master_0115' into dev · 52d39129
  hezhen authored Jan 15, 2020
  
  52d39129
- 123 · a8ff4d9d
  hezhen authored Jan 15, 2020
  
  a8ff4d9d
14 Jan, 2020 4 commits
- Merge branch 'app-version-mark' into dev · 71927300
  zuoyh authored Jan 14, 2020
  
  71927300
- APP版本标识功能 · 098b3716
  zuoyh authored Jan 14, 2020
```
增加来源类型
```
  098b3716
- Merge branch 'app-version-mark' into dev · 289c2a27
  zuoyh authored Jan 14, 2020
```
# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java
```
  289c2a27
- APP版本标识功能 · ff303f88
  zuoyh authored Jan 14, 2020
```
增加会员页面可查询标识
```
  ff303f88
13 Jan, 2020 4 commits
- Merge branch 'master_source' into dev · 154393b5
  hezhen authored Jan 13, 2020
  
  154393b5
- 123 · 45374ce9
  hezhen authored Jan 13, 2020
  
  45374ce9
- Merge branch 'app-version-mark' into dev · 4b7a7aef
  zuoyh authored Jan 13, 2020
  
  4b7a7aef
- APP版本标识功能 · 0c2173ae
  zuoyh authored Jan 13, 2020
```
新增列表查询接口
```
  0c2173ae