 袁野
|
17d7c9cee4
|
Merge remote-tracking branch 'origin/order_yy' into order_yy
|
2 years ago |
|
袁野
|
728e0cb33d
|
1
|
2 years ago |
|
袁野
|
2b7bd11c52
|
Merge remote-tracking branch 'origin/order_yy' into order_yy
# Conflicts:
# hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/common/utils/WxUtils.java
|
2 years ago |
|
袁野
|
a324e6f01f
|
1
|
2 years ago |
|
袁野
|
79a78e2048
|
1
|
2 years ago |
|
袁野
|
d6981540f1
|
修改区域公司
|
2 years ago |
|
袁野
|
2d55966453
|
修改区域公司
|
2 years ago |
|
袁野
|
daaef7efd5
|
修改区域公司
|
2 years ago |
|
袁野
|
eac9c4008a
|
修改区域公司
|
2 years ago |
|
袁野
|
8769b071cc
|
Merge branch 'master' into order_yy
* master:
1
修改二维码
提交微信小程序多次推送问题
提交修改
21
no message
提交代码
提交代码
提交代码
1
1
# Conflicts:
# hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
# hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
|
2 years ago |
|
袁野
|
fd41cee178
|
修改区域公司
|
2 years ago |
|
袁野
|
684823d116
|
提交代码
|
2 years ago |
|
袁野
|
9efbeb61f9
|
修改区域公司
|
2 years ago |
|
袁野
|
fde3db4fa8
|
修改区域公司
|
2 years ago |
|
袁野
|
3787961b31
|
1
|
2 years ago |
|
袁野
|
a6b17daa62
|
Merge branch 'order_yy' of http://139.159.177.244:3000/hurui/hai-server into order_yy
|
2 years ago |
|
袁野
|
4b1994be68
|
1
|
2 years ago |
|
袁野
|
7f4dfda87a
|
1
|
2 years ago |
|
袁野
|
6a85d4a2f4
|
修改二维码
|
2 years ago |
|
袁野
|
d17a7b0b57
|
Merge branch 'master' into dev_yy
* master:
提交微信小程序多次推送问题
no message
提交代码
提交代码
提交代码
1
1
|
2 years ago |
|
袁野
|
ee366f9fbd
|
提交微信小程序多次推送问题
|
2 years ago |
|
袁野
|
585f25a14f
|
提交修改
|
2 years ago |
|
袁野
|
ace46b4beb
|
21
|
2 years ago |
|
袁野
|
355a4c598d
|
no message
|
2 years ago |
 胡锐
|
72a3bbb787
|
提交代码
|
2 years ago |
|
胡锐
|
42bc1db51d
|
提交代码
|
2 years ago |
|
胡锐
|
0352cf0a0f
|
解决冲突
|
2 years ago |
|
胡锐
|
9224c9c332
|
提交代码
|
2 years ago |
|
袁野
|
9b0e07f03c
|
1
|
2 years ago |
|
袁野
|
15e1d89441
|
1
|
2 years ago |
|
袁野
|
efd4d10627
|
1
|
2 years ago |
|
袁野
|
a5d0fd2843
|
Merge branch 'order_yy' of http://139.159.177.244:3000/hurui/hai-server into order_yy
|
2 years ago |
|
袁野
|
bab4b8c50c
|
1
|
2 years ago |
|
袁野
|
1a99e48ddf
|
Merge branch 'order_yy' of http://139.159.177.244:3000/hurui/hai-server into order_yy
* 'order_yy' of http://139.159.177.244:3000/hurui/hai-server:
1
|
2 years ago |
|
袁野
|
a1e49d9fba
|
1
|
2 years ago |
|
袁野
|
3aca2b3b0d
|
1
|
2 years ago |
|
袁野
|
d00e23c435
|
1
|
2 years ago |
|
袁野
|
f6b80b4fa0
|
Merge branch 'dev_yy' into order_yy
* dev_yy: (24 commits)
提交代码修改
修改话费查询bug
修改星巴克下架问题
1
修改区域公司
修改区域公司
提交代码
提交代码
1
提交代码
修改区域公司
修改区域公司
1
1
1.提交代码
修改区域公司
修改区域公司
修改区域公司
修改区域公司
提交代码
...
# Conflicts:
# hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java
# hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
|
2 years ago |
|
袁野
|
6d4259111b
|
提交代码修改
|
2 years ago |
|
胡锐
|
74dd3f47bf
|
提交代码
|
2 years ago |
|
袁野
|
7ed5736e25
|
修改话费查询bug
|
2 years ago |
|
袁野
|
b54c4e2678
|
修改星巴克下架问题
|
2 years ago |
|
袁野
|
4178734953
|
提交代码
|
2 years ago |
|
袁野
|
3ad6a64d70
|
1
|
2 years ago |
|
袁野
|
624fcba567
|
修改区域公司
|
2 years ago |
|
袁野
|
523fbe114e
|
修改区域公司
|
2 years ago |
|
胡锐
|
5397b66b1a
|
提交代码
|
2 years ago |
|
胡锐
|
e94eb37170
|
提交代码
|
2 years ago |
|
胡锐
|
42dc475fb4
|
提交代码
|
2 years ago |
|
胡锐
|
3cfe1aa378
|
提交代码
|
2 years ago |
