Commits · 29a25bf6b830dc9482b3d553475c3b858d864db4 · 董敬伟 / liquidnet-bus-v1

13 Dec, 2022 6 commits
- Merge branch 'master' into dev_gjy_now_order_detals_paycode · 29a25bf6
  胡佳晨 authored Dec 13, 2022
```
# Conflicts:
#	liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinExportService.java
#	liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinStoreOrderMapper.xml
```
  29a25bf6
- Merge branch 'pre' into 'master' · 2355f74e
  Administrator authored Dec 13, 2022
```
Pre

See merge request !332
```
  2355f74e
- 提交周焕导出 · 4b54e7eb
  胡佳晨 authored Dec 13, 2022
  
  4b54e7eb
- 提交周焕导出 · b180d51f
  胡佳晨 authored Dec 13, 2022
  
  b180d51f
- 提交周焕导出 · f76f185a
  胡佳晨 authored Dec 13, 2022
  
  f76f185a
- 提交周焕导出 · e0aece96
  胡佳晨 authored Dec 13, 2022
  
  e0aece96
09 Dec, 2022 1 commit
- 发起退款接口取消用户id判断 · ecba5c8a
  胡佳晨 authored Dec 09, 2022
  
  ecba5c8a
07 Dec, 2022 1 commit
- 提交 · a3bbef0c
  胡佳晨 authored Dec 07, 2022
  
  a3bbef0c
06 Dec, 2022 2 commits
- 修改 pos banner · 33fe4a5a
  胡佳晨 authored Dec 06, 2022
  
  33fe4a5a
- 修改 pos banner · 90ca54a5
  胡佳晨 authored Dec 06, 2022
  
  90ca54a5
05 Dec, 2022 7 commits
- Merge remote-tracking branch 'origin/dev_gjy_now_order_detals_paycode' into... · ec9b646b
  dongchun authored Dec 05, 2022
```
Merge remote-tracking branch 'origin/dev_gjy_now_order_detals_paycode' into dev_gjy_now_order_detals_paycode
```
  ec9b646b
- 添加选择活动 · b42e1319
  dongchun authored Dec 05, 2022
  
  b42e1319
- 我的券列表店铺券可根据用户id查询 · 19626f94
  胡佳晨 authored Dec 05, 2022
  
  19626f94
- 添加选择活动 · 1531610b
  dongchun authored Dec 05, 2022
  
  1531610b
- 提交离线券相关接口 · 0259556f
  胡佳晨 authored Dec 05, 2022
  
  0259556f
- 正在下单活动搜索支持 get · a374718d
  胡佳晨 authored Dec 05, 2022
  
  a374718d
- 添加 banner position 10 · b657dcc0
  胡佳晨 authored Dec 05, 2022
  
  b657dcc0
02 Dec, 2022 1 commit
- gjy 接口需求修改 · 465deff5
  胡佳晨 authored Dec 02, 2022
  
  465deff5
30 Nov, 2022 7 commits
- Merge branch 'pre' into 'master' · a28fe678
  Administrator authored Nov 30, 2022
```
Pre

See merge request !331
```
  a28fe678
- Merge branch 'dev221130zgb_export_zzMarketOrder' into 'pre' · bc4e6178
  Administrator authored Nov 30, 2022
```
Dev221130zgb export zz market order

See merge request !330
```
  bc4e6178
- ~api:正在下单:活动订单数据导出-周焕:文件名称调整; · 77fbd333
  zhanggb authored Nov 30, 2022
  
  77fbd333
- ~api:正在下单:活动订单数据导出-周焕:活动ID+ZZ前缀; · 2709f11b
  zhanggb authored Nov 30, 2022
  
  2709f11b
- ~api:正在下单:活动订单数据导出LOG-周焕; · cc50c382
  zhanggb authored Nov 30, 2022
  
  cc50c382
- ~api:正在下单:活动订单数据导出-周焕; · 4c3030d9
  zhanggb authored Nov 30, 2022
  
  4c3030d9
- +api:正在下单:活动订单数据导出-周焕; · 67484de3
  zhanggb authored Nov 30, 2022
  
  67484de3
28 Nov, 2022 8 commits
- Merge branch 'pre' into 'master' · 92699679
  Administrator authored Nov 28, 2022
```
Pre

See merge request !329
```
  92699679
- Merge branch 'editTicket_1128_master' into pre · 4792f39e
  Your Name authored Nov 28, 2022
  
  4792f39e
- 修改满减券参数 · 215b9114
  Your Name authored Nov 28, 2022
  
  215b9114
- 修改代金券全部商品 · ce94d969
  Your Name authored Nov 28, 2022
  
  ce94d969
- 添加总代名称 · 559e4fc0
  胡佳晨 authored Nov 28, 2022
  
  559e4fc0
- 修改校园代理手机号证件号 · f5b37da8
  胡佳晨 authored Nov 28, 2022
  
  f5b37da8
- 修改校园代理手机号证件号 · bd01c485
  胡佳晨 authored Nov 28, 2022
  
  bd01c485
- Merge branch 'master' into hjc_smile_1115 · dcc35187
  胡佳晨 authored Nov 28, 2022
  
  dcc35187
25 Nov, 2022 4 commits
- Merge branch 'pre' into 'master' · abb53648
  Administrator authored Nov 25, 2022
```
Pre

See merge request !328
```
  abb53648
- 修改 goblin · 700e01d5
  胡佳晨 authored Nov 25, 2022
  
  700e01d5
- 修改 goblin · 60910d0a
  胡佳晨 authored Nov 25, 2022
  
  60910d0a
- 修改 goblin · 764239dc
  胡佳晨 authored Nov 25, 2022
  
  764239dc
24 Nov, 2022 1 commit
- pos机出货核销详情接口 · c81c09a0
  胡佳晨 authored Nov 24, 2022
  
  c81c09a0
23 Nov, 2022 1 commit
- 修改商品再次支付 · aba34028
  胡佳晨 authored Nov 23, 2022
  
  aba34028
22 Nov, 2022 1 commit
- 修改 pos · 810e7558
  胡佳晨 authored Nov 22, 2022
  
  810e7558