Commits · fed76cdb3b83e3e0b67ae8f16c658dc8fcb33dce · 汤强勇 / webBuild

13 Jan, 2020 4 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · fed76cdb
```
commitId:a255b337 ====== 01/13/20 10:18:38 - andyxiezhonglong - 修改烈性

See merge request !25
```
  谢中龙 authored Jan 13, 2020
  fed76cdb Browse Files
- commitId:a255b337 ====== 01/13/20 10:18:38 - andyxiezhonglong - 修改烈性 · 9e5149c8
  谢中龙 authored Jan 13, 2020
  
  9e5149c8 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 4388a0be
```
commitId:29befe60 ====== 01/13/20 09:58:49 - andyxiezhonglong - 支付流程改变

See merge request !24
```
  谢中龙 authored Jan 13, 2020
  4388a0be Browse Files
- commitId:29befe60 ====== 01/13/20 09:58:49 - andyxiezhonglong - 支付流程改变 · 6d5aad4d
  谢中龙 authored Jan 13, 2020
  
  6d5aad4d Browse Files
10 Jan, 2020 3 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 8ef77104
```
Wx mall

See merge request !23
```
  谢中龙 authored Jan 10, 2020
  8ef77104 Browse Files
- commitId:3f261124 ====== 01/10/20 10:07:11 - andyxiezhonglong - 提交代码 · a2e418c7
  谢中龙 authored Jan 10, 2020
  
  a2e418c7 Browse Files
- commitId:7b5d855a ====== 01/10/20 10:02:08 - andyxiezhonglong - 提交代码 · b92a850e
  谢中龙 authored Jan 10, 2020
  
  b92a850e Browse Files
08 Jan, 2020 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 3f550f2b
```
余额充值_限制2132和李雷品牌ID

See merge request !22
```
  谢中龙 authored Jan 08, 2020
  3f550f2b Browse Files
- commitId:1092004c ====== 01/08/20 16:22:37 - andyxiezhonglong - 限制2132和李雷品牌ID · a0bd81b8
  谢中龙 authored Jan 08, 2020
  
  a0bd81b8 Browse Files
19 Dec, 2019 6 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 7e6a064d
```
commitId:b2ad5110 ====== 12/19/19 13:59:30 - andyxiezhonglong - 李雷和2132限制

See merge request !21
```
  谢中龙 authored Dec 19, 2019
  7e6a064d Browse Files
- commitId:b2ad5110 ====== 12/19/19 13:59:30 - andyxiezhonglong - 李雷和2132限制 · 24a71a60
  谢中龙 authored Dec 19, 2019
  
  24a71a60 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 1ac7048e
```
commitId:2545e3cc ====== 12/19/19 13:54:06 - andyxiezhonglong - 李雷限制

See merge request !20
```
  谢中龙 authored Dec 19, 2019
  1ac7048e Browse Files
- commitId:2545e3cc ====== 12/19/19 13:54:06 - andyxiezhonglong - 李雷限制 · 876f7608
  谢中龙 authored Dec 19, 2019
  
  876f7608 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 8ad44f92
```
commitId:0a0ebba5 ====== 12/19/19 13:17:47 - andyxiezhonglong - 修改内容

See merge request !19
```
  谢中龙 authored Dec 19, 2019
  8ad44f92 Browse Files
- commitId:0a0ebba5 ====== 12/19/19 13:17:47 - andyxiezhonglong - 修改内容 · b837a38a
  谢中龙 authored Dec 19, 2019
  
  b837a38a Browse Files
09 Dec, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · b296575c
```
commitId:1294ff04 ====== 12/09/19 16:59:32 - andyxiezhonglong - 余额充值是，赠送金额为o是不显示

See merge request !17
```
  谢中龙 authored Dec 09, 2019
  b296575c Browse Files
- commitId:1294ff04 ====== 12/09/19 16:59:32 - andyxiezhonglong - 余额充值是，赠送金额为o是不显示 · c3c622c0
  谢中龙 authored Dec 09, 2019
  
  c3c622c0 Browse Files
09 Sep, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 8a97f5a2
```
commitId:5e317b01 ====== 09/09/19 13:18:52 - andyxiezhonglong - 修改上个版本遗留代码

See merge request !15
```
  谢中龙 authored Sep 09, 2019
  8a97f5a2 Browse Files
- commitId:5e317b01 ====== 09/09/19 13:18:52 - andyxiezhonglong - 修改上个版本遗留代码 · fcd37e2b
  谢中龙 authored Sep 09, 2019
  
  fcd37e2b Browse Files
20 Aug, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 34c4881e
```
Wx mall

See merge request !13
```
  谢中龙 authored Aug 20, 2019
  34c4881e Browse Files
- commitId:cfad32a6 ====== 08/19/19 16:14:02 - xuwk - 鼎元支付信息获取方式修改 · f51a6bc5
  谢中龙 authored Aug 20, 2019
  
  f51a6bc5 Browse Files
17 Aug, 2019 3 commits
- commitId:be42c69c ====== 08/17/19 13:29:10 - andyxiezhonglong - Merge branch… · 7073e800
```
commitId:be42c69c ====== 08/17/19 13:29:10 - andyxiezhonglong - Merge branch 'wx-mall6.33.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.33.0
```
  谢中龙 authored Aug 17, 2019
  7073e800 Browse Files
- commitId:a517aa84 ====== 08/17/19 10:33:22 - andyxiezhonglong - 新增dingyuan支付 · 2862b729
  谢中龙 authored Aug 17, 2019
  
  2862b729 Browse Files
- commitId:6ece0aa8 ====== 08/16/19 19:17:19 - andyxiezhonglong - 增加dingyuan支付类型判断 · 249ebbe9
  谢中龙 authored Aug 17, 2019
  
  249ebbe9 Browse Files
24 Jul, 2019 1 commit
- Merge branch 'wxMall_PRD' into 'wxMall_UAT' · 393ac458
```
Wx mall to uat

See merge request !12
```
  谢中龙 authored Jul 24, 2019
  393ac458 Browse Files
18 Jul, 2019 10 commits
- Merge branch 'wxMall_UAT' into 'wxMall_PRD' · 16e90957
```
Wx mall uat

See merge request !11
```
  谢中龙 authored Jul 18, 2019
  16e90957 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 18869079
```
Wx mall

See merge request !10
```
  谢中龙 authored Jul 18, 2019
  18869079 Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · ad305bea
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  ad305bea Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · 0565c3fb
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  0565c3fb Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · 4e94c055
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  4e94c055 Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · cc75e838
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  cc75e838 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 5e7870a1
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch…

See merge request !9
```
  谢中龙 authored Jul 18, 2019
  5e7870a1 Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · d000196a
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  d000196a Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · 03be984b
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch…

See merge request !8
```
  谢中龙 authored Jul 18, 2019
  03be984b Browse Files
- commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch… · d913cbba
```
commitId:e2bc797b ====== 07/18/19 11:28:15 - andyxiezhonglong - Merge branch 'wx-mall6.30.0' of ssh://gitlab.bigaka.net:2287/java/wx-mall into wx-mall6.30.0
```
  谢中龙 authored Jul 18, 2019
  d913cbba Browse Files
16 Jul, 2019 2 commits
- Merge branch 'wxMall' into 'wxMall_UAT' · 9dd698b6
```
commitId:7038054e ====== 07/16/19 13:39:19 - andyxiezhonglong - 修改bug

See merge request !7
```
  谢中龙 authored Jul 16, 2019
  9dd698b6 Browse Files
- commitId:7038054e ====== 07/16/19 13:39:19 - andyxiezhonglong - 修改bug · 0a4288ff
  谢中龙 authored Jul 16, 2019
  
  0a4288ff Browse Files
15 Jul, 2019 3 commits
- Merge branch 'wxMall_UAT' into 'wxMall_PRD' · ba9602a2
```
Wx mall uat

See merge request !6
```
  谢中龙 authored Jul 15, 2019
  ba9602a2 Browse Files
- Merge branch 'wxMall' into 'wxMall_UAT' · ec46790e
```
commitId:79fc12b3 ====== 07/15/19 16:32:41 - renxl - 6.30.0 满减满赠 - 线上、线下订单：校验会员参与限制次数  --- 传入当前门店；

See merge request !5
```
  谢中龙 authored Jul 15, 2019
  ec46790e Browse Files
- commitId:79fc12b3 ====== 07/15/19 16:32:41 - renxl - 6.30.0 满减满赠 - 线上、线下订单：校验会员参与限制次数 --- 传入当前门店； · 257d17ae
  谢中龙 authored Jul 15, 2019
  
  257d17ae Browse Files