 袁野
|
01495d176f
|
1
|
2 years ago |
 胡锐
|
7eaf6a851b
|
Merge branch 'pre' of http://139.159.177.244:3000/hurui/hai-server into pre
|
2 years ago |
|
胡锐
|
0446ab4fad
|
提交代码
|
2 years ago |
|
袁野
|
7cc4dd5746
|
修改区域公司
|
2 years ago |
|
袁野
|
7191e75722
|
Merge branch 'pre'
* pre:
提交修改
提交代码
提交代码
分销代码
修改区域公司
1
修改话费定时任务问题
修改话费定时任务问题
修改话费定时任务问题
1
修改话费定时任务问题
修改话费定时任务问题
修改话费定时任务问题
# Conflicts:
# hai-service/src/main/resources/prod-9401/commonConfig.properties
# hai-service/src/main/resources/prod/commonConfig.properties
|
2 years ago |
|
袁野
|
35dec1eb1f
|
提交修改
|
2 years ago |
|
胡锐
|
1c0b9a3d59
|
提交代码
|
2 years ago |
|
胡锐
|
505577abd5
|
提交代码
|
2 years ago |
|
袁野
|
7642add9ff
|
Merge branch 'dev_yy' into pre
* dev_yy:
分销代码
修改区域公司
1
修改话费定时任务问题
修改话费定时任务问题
1
修改话费定时任务问题
修改话费定时任务问题
修改话费定时任务问题
|
2 years ago |
|
袁野
|
6a4aeaeaa7
|
1
|
2 years ago |
|
袁野
|
e66833057c
|
分销代码
|
2 years ago |
|
袁野
|
51ba4959cc
|
修改区域公司
|
2 years ago |
|
胡锐
|
be546ca89e
|
Merge branch 'pre' of http://139.159.177.244:3000/hurui/hai-server into pre
|
2 years ago |
|
胡锐
|
ed3b997948
|
提交代码
|
2 years ago |
|
袁野
|
92a013893c
|
解决冲突
|
2 years ago |
|
袁野
|
4d343225d4
|
修改区域公司
|
2 years ago |
|
袁野
|
caa49e8473
|
修改区域公司
|
2 years ago |
|
袁野
|
abcad5870d
|
1
|
2 years ago |
|
袁野
|
21b578307c
|
修改话费定时任务问题
|
2 years ago |
|
袁野
|
cb8d24c927
|
修改话费定时任务问题
|
2 years ago |
|
袁野
|
984bfab7fb
|
修改话费定时任务问题
|
2 years ago |
|
袁野
|
072d61a722
|
修改话费定时任务问题
|
2 years ago |
|
胡锐
|
2784b736e1
|
提交代码
|
2 years ago |
|
胡锐
|
c79c509146
|
Merge branch 'dev' into pre
|
2 years ago |
|
袁野
|
39b76479fd
|
Merge remote-tracking branch 'origin/dev_yy' into dev_yy
|
2 years ago |
|
胡锐
|
40c5011ca5
|
1
|
2 years ago |
|
胡锐
|
533bcb5484
|
Merge branch 'dev_yy' of http://139.159.177.244:3000/hurui/hai-server into dev
|
2 years ago |
|
袁野
|
4eed19cf0f
|
Merge remote-tracking branch 'origin/dev_yy' into dev_yy
|
2 years ago |
|
袁野
|
d5d286f074
|
1
|
2 years ago |
|
袁野
|
e6db8b58a6
|
Merge remote-tracking branch 'origin/dev_yy' into dev_yy
|
2 years ago |
|
袁野
|
61440198b6
|
Merge remote-tracking branch 'origin/dev_yy' into dev_yy
|
2 years ago |
|
袁野
|
a1986b9a29
|
Merge branch 'dev_yy' of http://139.159.177.244:3000/hurui/hai-server into dev_yy
|
2 years ago |
|
袁野
|
1c9058ee8d
|
1
|
2 years ago |
|
袁野
|
654718293c
|
修改话费定时任务问题
|
2 years ago |
|
胡锐
|
f6661e6d98
|
Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev
|
2 years ago |
|
胡锐
|
aeba88b7b7
|
提交代码
|
2 years ago |
|
袁野
|
def8091648
|
Merge branch 'dev' into pre
* dev:
1
修改话费定时任务问题
1
1
|
2 years ago |
|
袁野
|
6a43102a79
|
1
|
2 years ago |
|
袁野
|
e68774f4e2
|
修改话费定时任务问题
|
2 years ago |
|
胡锐
|
abb7fd081f
|
提交代码
|
2 years ago |
|
袁野
|
28afaf4719
|
1
|
2 years ago |
|
胡锐
|
a6ed9cff81
|
提交代码
|
2 years ago |
|
袁野
|
eecae1957e
|
修改话费定时任务问题
|
2 years ago |
|
袁野
|
dbd98fdf32
|
Merge branch 'master' into dev_yy
* master:
修改话费定时任务问题
提交代码
修改话费定时任务问题
提交代码
提交代码
修改话费定时任务问题
提交代码
提交代码
# Conflicts:
# hai-service/src/main/java/com/hai/service/impl/BsIntegralRebateServiceImpl.java
|
2 years ago |
|
袁野
|
80f1ec3403
|
1
|
2 years ago |
|
袁野
|
281cc423e0
|
Merge branch 'api-dev' into dev_yy
|
2 years ago |
|
袁野
|
5121d06e06
|
修改话费定时任务问题
|
2 years ago |
|
袁野
|
92ba2dac91
|
1
|
2 years ago |
|
袁野
|
dd9bcc4cbe
|
1
|
2 years ago |
|
袁野
|
c7e8d680b4
|
Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev
|
2 years ago |
