Commits · c13666fb88d8dbff2662148e72ba466c4fc0bb97 · pseer / gxpt_ht · GitLab

26 Oct, 2023 4 commits
- Merge remote-tracking branch 'origin/main' · c13666fb
```
# Conflicts:
#	share-admin/src/main/java/share/web/controller/system/SOrderController.java
#	share-system/src/main/java/share/system/service/ISOrderService.java
```
  wuwenlong authored Oct 26, 2023
  c13666fb Browse Files
- order refund dev; · 580a17ec
  wuwenlong authored Oct 26, 2023
  
  580a17ec Browse Files
- 更改查询路径 · 1014745e
  吕明尚 authored Oct 26, 2023
  
  1014745e Browse Files
- 写预约订单到期自动更新 · c598aed5
  吕明尚 authored Oct 26, 2023
  
  c598aed5 Browse Files
25 Oct, 2023 13 commits
- 更改保洁记录路径 · d855f56d
  吕明尚 authored Oct 25, 2023
  
  d855f56d Browse Files
- bugfix; · 2ff0d567
  wuwenlong authored Oct 25, 2023
  
  2ff0d567 Browse Files
- login out bugfix; · f69c46fd
  wuwenlong authored Oct 25, 2023
  
  f69c46fd Browse Files
- Merge remote-tracking branch 'origin/main' · 6b903495
  wuwenlong authored Oct 25, 2023
  
  6b903495 Browse Files
- login out bugfix; · 8ef61f7c
  wuwenlong authored Oct 25, 2023
  
  8ef61f7c Browse Files
- Merge remote-tracking branch 'origin/main' · 87e934bb
  吕明尚 authored Oct 25, 2023
  
  87e934bb Browse Files
- 新增小程序需求接口 · f0e650c7
  吕明尚 authored Oct 25, 2023
  
  f0e650c7 Browse Files
- Merge remote-tracking branch 'origin/main' · 93ac8424
```
# Conflicts:
#	share-system/src/main/java/share/system/service/ISOrderService.java
#	share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
```
  wuwenlong authored Oct 25, 2023
  93ac8424 Browse Files
- wechat pay callback dev; · e712f029
  wuwenlong authored Oct 25, 2023
  
  e712f029 Browse Files
- 新增小程序需求接口 · 893d090d
  吕明尚 authored Oct 25, 2023
  
  893d090d Browse Files
- bugfix; · 53d83141
  wuwenlong authored Oct 25, 2023
  
  53d83141 Browse Files
- unpay order aotuchancel task dev; · 7596697d
  wuwenlong authored Oct 25, 2023
  
  7596697d Browse Files
- 查询可用优惠卷完成 · 2357c337
  吕明尚 authored Oct 25, 2023
  
  2357c337 Browse Files
24 Oct, 2023 4 commits
- 优惠卷领取记录类增加优惠卷有效时间 · 87fdcdb2
  吕明尚 authored Oct 24, 2023
  
  87fdcdb2 Browse Files
- 添加点评北极星平台接口 · 5caa0de0
  吕明尚 authored Oct 24, 2023
  
  5caa0de0 Browse Files
- Merge remote-tracking branch 'origin/main' · 62df8d6b
  wuwenlong authored Oct 24, 2023
  
  62df8d6b Browse Files
- create order otp; · e560e5ab
```
user login opt;
```
  wuwenlong authored Oct 24, 2023
  e560e5ab Browse Files
23 Oct, 2023 5 commits
- 首页的用户信息添加优惠卷数量 · 08291522
  吕明尚 authored Oct 23, 2023
  
  08291522 Browse Files
- create order dev; · 538f83d0
  wuwenlong authored Oct 23, 2023
  
  538f83d0 Browse Files
- 订单表增加商户订单号字段，增加验券逻辑 · 81caf6da
  吕明尚 authored Oct 23, 2023
  
  81caf6da Browse Files
- 修改优惠卷表字段 · 589e0cb7
  吕明尚 authored Oct 23, 2023
  
  589e0cb7 Browse Files
- 修改订单表字段 · 526d8d18
  吕明尚 authored Oct 23, 2023
  
  526d8d18 Browse Files
20 Oct, 2023 6 commits
- 优惠券领取记录表增加门店类型字段 · 3359a3f6
  吕明尚 authored Oct 20, 2023
  
  3359a3f6 Browse Files
- Merge remote-tracking branch 'origin/main' · dfb678c4
  wuwenlong authored Oct 20, 2023
  
  dfb678c4 Browse Files
- room status opt; · caa5e5c9
```
order computer price opt;
create order dev %30;
```
  wuwenlong authored Oct 20, 2023
  caa5e5c9 Browse Files
- 保洁分配 · 1e1a909d
  YG8999 authored Oct 20, 2023
  
  1e1a909d Browse Files
- login bugfix · c4eae0b5
  wuwenlong authored Oct 20, 2023
  
  c4eae0b5 Browse Files
- login bugfix · c2ea7233
  wuwenlong authored Oct 20, 2023
  
  c2ea7233 Browse Files
19 Oct, 2023 8 commits
- swagger opt · a0ce85e2
  wuwenlong authored Oct 19, 2023
  
  a0ce85e2 Browse Files
- computer order price service dev; · 7920cab0
  wuwenlong authored Oct 19, 2023
  
  7920cab0 Browse Files
- computer order price service dev; · 055953c1
  wuwenlong authored Oct 19, 2023
  
  055953c1 Browse Files
- Merge remote-tracking branch 'origin/main' · f193fbd9
  wuwenlong authored Oct 19, 2023
  
  f193fbd9 Browse Files
- computer order price service dev; · 464a76a2
  wuwenlong authored Oct 19, 2023
  
  464a76a2 Browse Files
- 增加验券准备 · 860f749c
  吕明尚 authored Oct 19, 2023
  
  860f749c Browse Files
- 工具类更改Impl类 · 50b2df96
  吕明尚 authored Oct 19, 2023
  
  50b2df96 Browse Files
- config opt; · 720140e5
  wuwenlong authored Oct 19, 2023
  
  720140e5 Browse Files