Commits · 4b49472aea16bdbe9ef27117252806b574d1f3cb · huluobin / gogirl-miniapp-backend

31 Jul, 2020 2 commits

update · 4b49472a
huluobin authored Jul 31, 2020

4b49472a

# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
#	src/main/resources/application.yml

authored Jul 31, 2020

cd3cde1f

28 Jul, 2020 12 commits
- 战术更新 · a6325d5e
  huluobin authored Jul 28, 2020
  
  a6325d5e
- update · 8f448577
  huluobin authored Jul 28, 2020
  
  8f448577
- 战术更新 · b736f9be
  huluobin authored Jul 28, 2020
  
  b736f9be
- update · e319de01
  huluobin authored Jul 28, 2020
  
  e319de01
- 战术更新 · 3317c52f
  huluobin authored Jul 28, 2020
  
  3317c52f
- 战术更新 · d7519037
  huluobin authored Jul 28, 2020
  
  d7519037
- 战术更新 · f479f114
  huluobin authored Jul 28, 2020
  
  f479f114
- 战术更新 · 9efa49a2
  huluobin authored Jul 28, 2020
  
  9efa49a2
- 战术更新 · 7a62d833
  huluobin authored Jul 28, 2020
  
  7a62d833
- 战术更新 · db298a73
  huluobin authored Jul 28, 2020
  
  db298a73
- 战术更新 · 56d613f5
  huluobin authored Jul 28, 2020
  
  56d613f5
- 战术更新 · bf5337aa
  huluobin authored Jul 28, 2020
  
  bf5337aa
24 Jul, 2020 13 commits
- 战术更新 · f3297fe9
  huluobin authored Jul 24, 2020
  
  f3297fe9
- 战术更新 · 1d82e515
  huluobin authored Jul 24, 2020
  
  1d82e515
- 用户消费记录 · a716b031
  huluobin authored Jul 24, 2020
  
  a716b031
- Merge branch 'master' into 3.9 · 264b2360
```
# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
#	src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
#	src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java
```
  huluobin authored Jul 24, 2020
  264b2360
- 用户消费记录 · 49decd5b
  huluobin authored Jul 24, 2020
  
  49decd5b
- 同步折扣券折扣率定时任务 · 9d455366
  huluobin authored Jul 24, 2020
  
  9d455366
- 战术更新 · 2788f878
  huluobin authored Jul 24, 2020
  
  2788f878
- 战术更新 · 6b677164
  huluobin authored Jul 24, 2020
  
  6b677164
- 美博会调查问卷类型 · 67e44c52
  huluobin authored Jul 24, 2020
  
  67e44c52
- 战术更新 · 0b254509
  huluobin authored Jul 24, 2020
  
  0b254509
- 战术更新 · 8ecc9762
  huluobin authored Jul 24, 2020
  
  8ecc9762
- 美博会调查问卷 · 22e307c7
  huluobin authored Jul 24, 2020
  
  22e307c7
- 战术更新 · 5add2308
  huluobin authored Jul 24, 2020
  
  5add2308
23 Jul, 2020 9 commits
- 战术更新 · 57e54684
  huluobin authored Jul 23, 2020
  
  57e54684
- 战术更新 · 28fc7102
  huluobin authored Jul 23, 2020
  
  28fc7102
- 战术更新 · 85e48f87
  huluobin authored Jul 23, 2020
  
  85e48f87
- 战术更新 · 8f257ddc
  huluobin authored Jul 23, 2020
  
  8f257ddc
- 战术更新 · 7bcc363d
  huluobin authored Jul 23, 2020
  
  7bcc363d
- 战术更新 · 86ce4857
  huluobin authored Jul 23, 2020
  
  86ce4857
- 错误状态码 · 1089fb95
  huluobin authored Jul 23, 2020
  
  1089fb95
- 代码调整 · f874c39c
  huluobin authored Jul 23, 2020
  
  f874c39c
- 代码调整 · 61d082d5
```
日志调整
```
  huluobin authored Jul 23, 2020
  61d082d5
21 Jul, 2020 2 commits

Merge branch 'master' into 3.9 · baa344a5

# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/application-prod.yml
#	src/main/resources/mapper/store/StoreClassesTechnicianMapper.xml

authored Jul 21, 2020

baa344a5

update · 4dcf484e
huluobin authored Jul 21, 2020

4dcf484e

20 Jul, 2020 2 commits
- 排班的bug · ef7424a6
  huluobin authored Jul 20, 2020
  
  ef7424a6
- update · f9b830ba
  huluobin authored Jul 20, 2020
  
  f9b830ba