Commits · cc5ef03f06073063383ebf96f2f416b995e5d712 · pseer / gxpt_ht · GitLab

27 Jan, 2024 8 commits
- Merge branch 'dev' into test · cc5ef03f
  吕明尚 authored Jan 27, 2024
  
  cc5ef03f Browse Files
- 修改新增门店更新优惠卷适用门店的问题 · c5e7c1e1
  吕明尚 authored Jan 27, 2024
  
  c5e7c1e1 Browse Files
- Merge branch 'dev' into test · 28b789f7
  吕明尚 authored Jan 27, 2024
  
  28b789f7 Browse Files
- 查询保洁记录增加房间id判断 · c6c33481
  吕明尚 authored Jan 27, 2024
  
  c6c33481 Browse Files
- Merge branch 'dev' into test · 4e698f0b
  吕明尚 authored Jan 27, 2024
  
  4e698f0b Browse Files
- 小程序设备管理增加延时5秒 · 41d6f23d
  吕明尚 authored Jan 27, 2024
  
  41d6f23d Browse Files
- Merge branch 'dev' into test · f241a439
  吕明尚 authored Jan 27, 2024
  
  f241a439 Browse Files
- 修改脏房判断只在下单时判断 · e1c32830
  吕明尚 authored Jan 27, 2024
  
  e1c32830 Browse Files
26 Jan, 2024 2 commits
- Merge branch 'dev' into test · baacbf12
  吕明尚 authored Jan 26, 2024
  
  baacbf12 Browse Files
- 删除店员，删除关联的门店 · 74f3d360
  吕明尚 authored Jan 26, 2024
  
  74f3d360 Browse Files
25 Jan, 2024 15 commits
- Merge branch 'dev' into test · af4d5688
  吕明尚 authored Jan 25, 2024
  
  af4d5688 Browse Files
- 解决开门报错的问题 · 4b85f56f
  吕明尚 authored Jan 25, 2024
  
  4b85f56f Browse Files
- Merge branch 'dev' into test · 613de8fd
  吕明尚 authored Jan 25, 2024
  
  613de8fd Browse Files
- 修改设备查询的BUG · 0af9a2db
  吕明尚 authored Jan 25, 2024
  
  0af9a2db Browse Files
- Merge branch 'dev_lch' into dev · 0c1ed350
```
# Conflicts:
#	share-system/src/main/resources/mapper/system/DeviceLogMapper.xml
#	share-system/src/main/resources/mapper/system/DeviceStatusLogMapper.xml
#	share-system/src/main/resources/mapper/system/SRoomMapper.xml
```
  hayden authored Jan 25, 2024
  0c1ed350 Browse Files
- 后台管理系统设备管理-设备状态变更记录：新增筛选条件门店、房间 · c5c84b11
  hayden authored Jan 25, 2024
  
  c5c84b11 Browse Files
- 后台管理系统设备管理-设备操作日志：新增筛选条件门店、房间 · bf60002b
  hayden authored Jan 25, 2024
  
  bf60002b Browse Files
- 后台管理系统设备管理-设备操作日志：bug修复 · 37bbd868
  hayden authored Jan 25, 2024
  
  37bbd868 Browse Files
- 后台管理系统设备管理-设备网关信息：新增筛选条件门店 · f1d2b985
  hayden authored Jan 25, 2024
  
  f1d2b985 Browse Files
- 后台管理系统设备管理-设备信息：新增筛选条件门店、房间 · 8320a55c
  hayden authored Jan 25, 2024
  
  8320a55c Browse Files
- 后台管理系统系统管理-日志管理-扫呗支付日志：新增筛选条件门店、房间 · c1ed7fee
  hayden authored Jan 25, 2024
  
  c1ed7fee Browse Files
- 后台管理系统系统管理-日志管理-短信日志：新增筛选条件门店、房间 · 987a23da
  hayden authored Jan 25, 2024
  
  987a23da Browse Files
- 房间新增排序值，倒序 · 93549a45
  hayden authored Jan 25, 2024
  
  93549a45 Browse Files
- Merge branch 'dev' into test · a0878418
  吕明尚 authored Jan 25, 2024
  
  a0878418 Browse Files
- 时长劵返回值增加以赠送数量 · e5b2b132
  吕明尚 authored Jan 25, 2024
  
  e5b2b132 Browse Files
24 Jan, 2024 8 commits
- Merge branch 'dev' into test · f4a0854f
  吕明尚 authored Jan 24, 2024
  
  f4a0854f Browse Files
- 在保洁自动完成的任务修改房间是否脏房 · c4e85090
  吕明尚 authored Jan 24, 2024
  
  c4e85090 Browse Files
- 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 7 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