Commits · 7b6e7d3f6f138e653f69259a6ada7461890a88f6 · base_platform_enterprise / gic-platform-enterprise · GitLab

14 Apr, 2020 5 commits
- Merge remote-tracking branch 'origin/developer' into developer · 7b6e7d3f
  guojuxing authored Apr 14, 2020
  
  7b6e7d3f Browse Files
- 微盟商城-订单配置 · 4425c285
  guojuxing authored Apr 14, 2020
  
  4425c285 Browse Files
- 修改sql · 9f32c950
  zhiwj authored Apr 14, 2020
  
  9f32c950 Browse Files
- Merge branch 'developer' of… · bd71fa28
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  zhiwj authored Apr 14, 2020
  bd71fa28 Browse Files
- 修改sql · a2c7f99b
  zhiwj authored Apr 14, 2020
  
  a2c7f99b Browse Files
13 Apr, 2020 14 commits
- 二维码 · 90203601
  陶光胜 authored Apr 13, 2020
  
  90203601 Browse Files
- 二维码 · b94c0180
  陶光胜 authored Apr 13, 2020
  
  b94c0180 Browse Files
- Merge branch 'developer' of… · 9e1ae9d7
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 13, 2020
  9e1ae9d7 Browse Files
- 二维码 · 0ba73840
  陶光胜 authored Apr 13, 2020
  
  0ba73840 Browse Files
- 微盟商城-会员卡配置新增修改 · 951f10fd
  guojuxing authored Apr 13, 2020
  
  951f10fd Browse Files
- 微盟商城-会员卡配置 · 343d23b0
  guojuxing authored Apr 13, 2020
  
  343d23b0 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 1abaf739
  guojuxing authored Apr 13, 2020
  
  1abaf739 Browse Files
- 公众号菜单同步微信调整：返回微信错误 · ec65e42d
  guojuxing authored Apr 13, 2020
  
  ec65e42d Browse Files
- Merge branch 'developer' of… · a64bad1c
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 13, 2020
  a64bad1c Browse Files
- 二维码 · 0b0e91c8
  陶光胜 authored Apr 13, 2020
  
  0b0e91c8 Browse Files
- 微盟商城新增，返回逐渐ID · 31fbe977
  guojuxing authored Apr 13, 2020
  
  31fbe977 Browse Files
- 微盟商城店铺增授权接口返回调整 · ac575dd6
  guojuxing authored Apr 13, 2020
  
  ac575dd6 Browse Files
- 微盟商城店铺增删改接口 · 6e2dc63c
  guojuxing authored Apr 13, 2020
  
  6e2dc63c Browse Files
- 微盟商城店铺增删改接口 · e4a277da
  guojuxing authored Apr 13, 2020
  
  e4a277da Browse Files
10 Apr, 2020 21 commits
- 二维码 · 6f021588
  陶光胜 authored Apr 10, 2020
  
  6f021588 Browse Files
- Merge branch 'developer' of… · 993d88e5
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 10, 2020
  993d88e5 Browse Files
- 二维码 · 6cc70f6d
  陶光胜 authored Apr 10, 2020
  
  6cc70f6d Browse Files
- 装修验证线下订单 · 74074eea
  guojuxing authored Apr 10, 2020
  
  74074eea Browse Files
- Merge branch 'developer' of… · fd2762dc
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 10, 2020
  fd2762dc Browse Files
- 二维码 · 0a6c6cdc
  陶光胜 authored Apr 10, 2020
  
  0a6c6cdc Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · a4d40726
  guojuxing authored Apr 10, 2020
  
  a4d40726 Browse Files
- 装修验证线下订单 · f7cf99e6
  guojuxing authored Apr 10, 2020
  
  f7cf99e6 Browse Files
- 二维码 · 93e25a42
  陶光胜 authored Apr 10, 2020
  
  93e25a42 Browse Files
- 二维码 · 0cc7b20f
  陶光胜 authored Apr 10, 2020
  
  0cc7b20f Browse Files
- 二维码 · 915485eb
  陶光胜 authored Apr 10, 2020
  
  915485eb Browse Files
- 二维码 · 5b10482b
  陶光胜 authored Apr 10, 2020
  
  5b10482b Browse Files
- 二维码 · c0ad3076
  陶光胜 authored Apr 10, 2020
  
  c0ad3076 Browse Files
- 二维码 · 9a342414
  陶光胜 authored Apr 10, 2020
  
  9a342414 Browse Files
- Merge branch 'developer' of… · 12743c8d
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

 Conflicts:
	gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/AccountBalanceStrategy.java
```
  陶光胜 authored Apr 10, 2020
  12743c8d Browse Files
- 引入auth · aa9c129e
  guojuxing authored Apr 10, 2020
  
  aa9c129e Browse Files
- 去掉signUtil · 729469d4
  guojuxing authored Apr 10, 2020
  
  729469d4 Browse Files
- 流水号调整 · 7197b8e8
  guojuxing authored Apr 10, 2020
  
  7197b8e8 Browse Files
- Merge branch 'developer' of… · df393f9a
```
Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
```
  陶光胜 authored Apr 10, 2020
  df393f9a Browse Files
- 二维码 · 19ee4f70
  陶光胜 authored Apr 10, 2020
  
  19ee4f70 Browse Files
- 网址配置 · 132182f6
  guojuxing authored Apr 10, 2020
  
  132182f6 Browse Files