Commits · 677097c48708a998bb316279ffd219447f549eb8 · pseer / gxpt_ht · GitLab

24 Jan, 2024 6 commits
- Merge branch 'dev' into test · 677097c4
  吕明尚 authored Jan 24, 2024
  
  677097c4 Browse Files
- 在结束保洁修改房间是否脏房 · e8442a90
  吕明尚 authored Jan 24, 2024
  
  e8442a90 Browse Files
- Merge branch 'dev' into test · da293421
  吕明尚 authored Jan 24, 2024
  
  da293421 Browse Files
- 房间表增加是否脏房字段，在自动完成保洁订单的自动任务中，保洁任务是否超过30分钟，且5分钟后没有订单修改房间的是否脏房字段为是，通知门店保洁及管理员 · c82abfbd
  吕明尚 authored Jan 24, 2024
  
  c82abfbd Browse Files
- 设备网关、设备日志查询条件新增 · fc274294
  YG8999 authored Jan 24, 2024
  
  fc274294 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ce4c4e40
  YG8999 authored Jan 24, 2024
  
  ce4c4e40 Browse Files
23 Jan, 2024 11 commits
- Merge branch 'dev' into test · 6bddadb9
  吕明尚 authored Jan 23, 2024
  
  6bddadb9 Browse Files
- 注销是否脏房字段 · 88617da6
  吕明尚 authored Jan 23, 2024
  
  88617da6 Browse Files
- Merge branch 'dev' into dev-lms · 14e2d707
  吕明尚 authored Jan 23, 2024
  
  14e2d707 Browse Files
- 修改批量分配保洁，管理入参 · c437a914
  吕明尚 authored Jan 23, 2024
  
  c437a914 Browse Files
- Merge branch 'dev_lch' into dev · de22fd43
  hayden authored Jan 23, 2024
  
  de22fd43 Browse Files
- 网关上报信息验证日志最新时间范围改为配置文件设置 · 6376ac76
```
网关设备状态验证最新上报时间范围改为配置文件设置
```
  YG8999 authored Jan 23, 2024
  6376ac76 Browse Files
- 更换定时任务调用api · 5405ee1d
```
更换创建订单调用美团api
```
  hayden authored Jan 23, 2024
  5405ee1d Browse Files
- Merge branch 'dev' into dev-lms · b2113574
  吕明尚 authored Jan 23, 2024
  
  b2113574 Browse Files
- 修改设备集合未绑定房间报错 · da3a9536
  吕明尚 authored Jan 23, 2024
  
  da3a9536 Browse Files
- 用户信息增加职务判断 · 010cbd85
  吕明尚 authored Jan 23, 2024
  
  010cbd85 Browse Files
- 设备权限 · 92c09319
  吕明尚 authored Jan 23, 2024
  
  92c09319 Browse Files
22 Jan, 2024 8 commits
- 修改保洁和设备管理权限 · a290146b
  吕明尚 authored Jan 22, 2024
  
  a290146b Browse Files
- Merge branch 'dev' into test · 6010c6ac
  吕明尚 authored Jan 22, 2024
  
  6010c6ac Browse Files
- 修改当门店下没房间时没保洁负责门店 · ef7991f7
  吕明尚 authored Jan 22, 2024
  
  ef7991f7 Browse Files
- 代码提交 · df6f054e
  吕明尚 authored Jan 22, 2024
  
  df6f054e Browse Files
- Merge branch 'dev' into test · b25f010d
  吕明尚 authored Jan 22, 2024
  
  b25f010d Browse Files
- 代码提交 · bd84aef0
  吕明尚 authored Jan 22, 2024
  
  bd84aef0 Browse Files
- 修改保洁记录为空的问题 · 4eb6a013
  吕明尚 authored Jan 22, 2024
  
  4eb6a013 Browse Files
- 去除核销补偿逻辑 · 36fc5af2
  hayden authored Jan 22, 2024
  
  36fc5af2 Browse Files
21 Jan, 2024 1 commit
- 1.团购验证完毕直接核销对应美团券，已经团购验证的券无法再重新验证 · 78f5a43c
```
2.定时访问美团api验证所有未使用的团购券，失效者删除
3.去除下单时的券核销逻辑
```
  hayden authored Jan 21, 2024
  78f5a43c Browse Files
20 Jan, 2024 14 commits
- Merge branch 'dev' into test · c0313858
  wuwenlong authored Jan 20, 2024
  
  c0313858 Browse Files
- 小程序端房间接口 · ee78c786
  wuwenlong authored Jan 20, 2024
  
  ee78c786 Browse Files
- Merge branch 'dev' into test · e60a1dc7
  wuwenlong authored Jan 20, 2024
  
  e60a1dc7 Browse Files
- 小程序端房间接口 · 56c7fa19
  wuwenlong authored Jan 20, 2024
  
  56c7fa19 Browse Files
- Merge branch 'dev' into test · bed9c024
  吕明尚 authored Jan 20, 2024
  
  bed9c024 Browse Files
- 修改套餐问题 · ce3d9884
  吕明尚 authored Jan 20, 2024
  
  ce3d9884 Browse Files
- Merge branch 'dev' into test · af93e6c6
  吕明尚 authored Jan 20, 2024
  
  af93e6c6 Browse Files
- 修改门店更新优惠卷配置 · e1557ee0
  吕明尚 authored Jan 20, 2024
  
  e1557ee0 Browse Files
- Merge branch 'dev' into test · b5bcd547
  wuwenlong authored Jan 20, 2024
  
  b5bcd547 Browse Files
- 小程序端房间接口 · 31647cea
  wuwenlong authored Jan 20, 2024
  
  31647cea Browse Files
- Merge branch 'dev' into test · 7c70d58e
  wuwenlong authored Jan 20, 2024
  
  7c70d58e Browse Files
- 小程序端房间接口 · ea0be758
  wuwenlong authored Jan 20, 2024
  
  ea0be758 Browse Files
- Merge branch 'dev' into test · ba58daa6
  wuwenlong authored Jan 20, 2024
  
  ba58daa6 Browse Files
- cancel pay bugfix; · eb426ecd
  wuwenlong authored Jan 20, 2024
  
  eb426ecd Browse Files