Commits · 987c78340820f1cce3d9ae6117c1cf09f5aa2d9c · huluobin / gogirl-miniapp-backend

10 Apr, 2020 1 commit

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

authored Apr 10, 2020

987c7834

09 Apr, 2020 18 commits
- 卡券fix · 3209d240
  huluobin authored Apr 09, 2020
  
  3209d240
- 卡券fix · 5ab8109b
  huluobin authored Apr 09, 2020
  
  5ab8109b
- update · 5728f76a
  huluobin authored Apr 09, 2020
  
  5728f76a
- 没有填写推荐人的充值记录自动记录美甲师 · bf54e487
  huluobin authored Apr 09, 2020
  
  bf54e487
- 过期注解移除 · 798f83ab
  huluobin authored Apr 09, 2020
  
  798f83ab
- 定时任务计划修改 · 662075f9
  huluobin authored Apr 09, 2020
  
  662075f9
- 环境评分 · b28d3bd6
  huluobin authored Apr 09, 2020
  
  b28d3bd6
- update · 23b51b48
  huluobin authored Apr 09, 2020
  
  23b51b48
- update · a8f8bfcc
  huluobin authored Apr 09, 2020
  
  a8f8bfcc
- 考勤 · f606bc06
  huluobin authored Apr 09, 2020
  
  f606bc06
- Merge branch 'fix' into 3.5 · b8861ceb
```
# Conflicts:
#	src/main/resources/mapper/store/TakeLeaveEventMapper.xml
```
  huluobin authored Apr 09, 2020
  b8861ceb
- 考勤 · 8436c5f1
  huluobin authored Apr 09, 2020
  
  8436c5f1
- 考勤申请加锁 · 6eb6d4cf
  huluobin authored Apr 09, 2020
  
  6eb6d4cf
- 考勤fix · bfc6193d
  huluobin authored Apr 09, 2020
  
  bfc6193d
- 考勤 · bb1cffe4
  huluobin authored Apr 09, 2020
  
  bb1cffe4
- 会员福利 · c0bb34dd
  huluobin authored Apr 09, 2020
  
  c0bb34dd
- 评论列表根据时间筛选。 · 578b9f4e
  huluobin authored Apr 09, 2020
  
  578b9f4e
- 订单评论fix · 4d821a0d
  huluobin authored Apr 09, 2020
  
  4d821a0d
08 Apr, 2020 21 commits
- maven修改 · e2a8bc75
  huluobin authored Apr 08, 2020
  
  e2a8bc75
- 定时任务 · f90d4872
  huluobin authored Apr 08, 2020
  
  f90d4872
- 定时任务 · 61706f28
  huluobin authored Apr 08, 2020
  
  61706f28
- 定时任务 · 386c4f57
  huluobin authored Apr 08, 2020
  
  386c4f57
- 成长数据数据完整度 · 12c1d688
  huluobin authored Apr 08, 2020
  
  12c1d688
- 订单数据完整度 · af0f9914
  huluobin authored Apr 08, 2020
  
  af0f9914
- fix · 959c5f84
  huluobin authored Apr 08, 2020
  
  959c5f84
- 目录调整 · b0ad4f1b
  huluobin authored Apr 08, 2020
  
  b0ad4f1b
- 工具类整理日志fix · e2c68839
  huluobin authored Apr 08, 2020
  
  e2c68839
- 订阅消息日志 · 06013377
  huluobin authored Apr 08, 2020
  
  06013377
- 模版消息日志记录 · b6361171
  huluobin authored Apr 08, 2020
  
  b6361171
- 异常日志修改 · df54851c
  huluobin authored Apr 08, 2020
  
  df54851c
- 更新预约服务状态校验 · ccf0d23a
  huluobin authored Apr 08, 2020
  
  ccf0d23a
- 更新预约状态加锁 · 2128aee1
  huluobin authored Apr 08, 2020
  
  2128aee1
- Merge branch 'master' into 3.5 · a8fa342f
```
# Conflicts:
#	src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
```
  huluobin authored Apr 08, 2020
  a8fa342f
- 预约款式时间计算 · cb4c402c
  huluobin authored Apr 08, 2020
  
  cb4c402c
- 预约款式时间计算 · 3699669e
  huluobin authored Apr 08, 2020
  
  3699669e
- fix · e1960b74
  huluobin authored Apr 08, 2020
  
  e1960b74
- fix · 3e0a8c53
  huluobin authored Apr 08, 2020
  
  3e0a8c53
- 日志 · 5e3f606f
  huluobin authored Apr 08, 2020
  
  5e3f606f
- update · dbbf8ed6
  huluobin authored Apr 08, 2020
  
  dbbf8ed6