Commits · 6f2aed4007a652841ea6739f20ca373ddf048d9d · park / extend · GitLab

23 Jun, 2020 10 commits
- 校验电话号码唯一 · 6f2aed40
  xieshixiang committed Jun 23, 2020
  
  6f2aed40 Browse Files
- Merge branch 'dev' into test · 7d82cb6d
```
# Conflicts:
#	domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
```
  xieshixiang committed Jun 23, 2020
  7d82cb6d Browse Files
- 校验电话号码唯一 · e97d3d45
  xieshixiang committed Jun 23, 2020
  
  e97d3d45 Browse Files
- 校验电话号码唯一 · 2cdc12be
  xieshixiang committed Jun 23, 2020
  
  2cdc12be Browse Files
- 校验电话号码唯一 · ede31bd8
  xieshixiang committed Jun 23, 2020
  
  ede31bd8 Browse Files
- 校验电话号码唯一 · 3efe4eda
  xieshixiang committed Jun 23, 2020
  
  3efe4eda Browse Files
- 修改时间类型 · 3d5e5f78
  xieshixiang committed Jun 23, 2020
  
  3d5e5f78 Browse Files
- Merge branch 'dev' into test · 92fad2e5
  xieshixiang committed Jun 23, 2020
  
  92fad2e5 Browse Files
- 修改时间类型 · c2d69122
  xieshixiang committed Jun 23, 2020
  
  c2d69122 Browse Files
- 修改时间类型 · 20a0ec64
  xieshixiang committed Jun 23, 2020
  
  20a0ec64 Browse Files
22 Jun, 2020 30 commits
- 返回参数校对 · 7bbab3c5
  xieshixiang committed Jun 22, 2020
  
  7bbab3c5 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · e8c03071
```
# Conflicts:
#	api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/ToolController.java
```
  xieshixiang committed Jun 22, 2020
  e8c03071 Browse Files
- 返回参数校对 · 85ca9ccc
  xieshixiang committed Jun 22, 2020
  
  85ca9ccc Browse Files
- Merge branch 'dev' into 'test' · b65cd7c8
```
Dev

See merge request !4
```
  lixian7 committed Jun 22, 2020
  b65cd7c8 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f363413a
  lixian7 committed Jun 22, 2020
  
  f363413a Browse Files
- 解密工具修改 · f8334316
  lixian7 committed Jun 22, 2020
  
  f8334316 Browse Files
- Merge branch 'dev' into 'test' · 16f4d496
```
Dev

See merge request !3
```
  lixian7 committed Jun 22, 2020
  16f4d496 Browse Files
- 优化代码 · 0ae1e2ec
  xieshixiang committed Jun 22, 2020
  
  0ae1e2ec Browse Files
- 添加解密工具 · 162089e7
  lixian7 committed Jun 22, 2020
  
  162089e7 Browse Files
- Merge branch 'dev' into 'test' · 1bb7a11d
```
Dev

See merge request !2
```
  lixian7 committed Jun 22, 2020
  1bb7a11d Browse Files
- 修改唯一建生成方式 · f4f43501
  lixian7 committed Jun 22, 2020
  
  f4f43501 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · fb0548f2
  lixian7 committed Jun 22, 2020
  
  fb0548f2 Browse Files
- 修改解绑接口返回值 · b03c0de3
  xieshixiang committed Jun 22, 2020
  
  b03c0de3 Browse Files
- 增加绑定操作返回结果封装 · a68eebdb
  xieshixiang committed Jun 22, 2020
  
  a68eebdb Browse Files
- Merge branch 'dev' into 'test' · af94e7d5
```
Dev

See merge request !1
```
  lixian7 committed Jun 22, 2020
  af94e7d5 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 17acf772
  lixian7 committed Jun 22, 2020
  
  17acf772 Browse Files
- 工具类 · 7b09a483
  lixian7 committed Jun 22, 2020
  
  7b09a483 Browse Files
- 修改sql语句 · a456118f
  xieshixiang committed Jun 22, 2020
  
  a456118f Browse Files
- 删除无用的sql语句 · 6dbcf18a
  xieshixiang committed Jun 22, 2020
  
  6dbcf18a Browse Files
- 为绑定请求参数中的车牌颜色,增加正则校验 · a0981ee2
  xieshixiang committed Jun 22, 2020
  
  a0981ee2 Browse Files
- 实体类调整调整 · be72e56d
  lixian7 committed Jun 22, 2020
  
  be72e56d Browse Files
- 日志配置调整 · 9cc3ad5c
  lixian7 committed Jun 22, 2020
  
  9cc3ad5c Browse Files
- 测试 · 2f0a07ca
  lixian7 committed Jun 22, 2020
  
  2f0a07ca Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a1c9171f
  xieshixiang committed Jun 22, 2020
  
  a1c9171f Browse Files
- 增加对查询车辆信息返回值的校验 · 74b1f5bd
  xieshixiang committed Jun 22, 2020
  
  74b1f5bd Browse Files
- 测试 · ce05e5bf
  lixian7 committed Jun 22, 2020
  
  ce05e5bf Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 7c669f77
  lixian7 committed Jun 22, 2020
  
  7c669f77 Browse Files
- 添加解密注解 · a4cb4ded
  lixian7 committed Jun 22, 2020
  
  a4cb4ded Browse Files
- 修改解绑条件限制逻辑 · 6cfe5a6d
  xieshixiang committed Jun 22, 2020
  
  6cfe5a6d Browse Files
- 修改解绑条件限制逻辑 · 29bc0eb1
  xieshixiang committed Jun 22, 2020
  
  29bc0eb1 Browse Files