 袁野
|
6039958843
|
1
|
6 years ago |
|
袁野
|
fe34f21da6
|
Merge branch 'api-dev' of http://139.159.177.244:3000/hurui/hai-server into api-dev
|
6 years ago |
|
袁野
|
841e9285fd
|
提交修改
|
2 years ago |
|
袁野
|
cebe26da2b
|
修改代码
|
2 years ago |
|
袁野
|
52bd873660
|
Merge branch 'master' into api-dev
* master:
1
1
# Conflicts:
# hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
|
2 years ago |
|
袁野
|
1480fd4ff8
|
1
|
2 years ago |
|
袁野
|
2803ea6a5b
|
1
|
2 years ago |
|
袁野
|
2c939a0bbe
|
Merge branch 'pre' of http://139.159.177.244:3000/hurui/hai-server into pre
* 'pre' of http://139.159.177.244:3000/hurui/hai-server:
提交代码
提交代码
提交diam
提交代码
|
2 years ago |
|
袁野
|
19351d49bb
|
修改代码
|
2 years ago |
|
袁野
|
f26f3a28c4
|
1
|
6 years ago |
|
袁野
|
a9cc50fe56
|
Merge branch 'api-dev' of http://139.159.177.244:3000/hurui/hai-server into api-dev
|
6 years ago |
|
袁野
|
97914af091
|
Merge branch 'api-dev' of http://139.159.177.244:3000/hurui/hai-server into api-dev
* 'api-dev' of http://139.159.177.244:3000/hurui/hai-server:
1
|
2 years ago |
|
袁野
|
ebf60916ec
|
1
|
2 years ago |
|
袁野
|
fe51cf5bdb
|
1
|
2 years ago |
|
袁野
|
115e7b8b9c
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
c9d7ef36e8
|
1
|
2 years ago |
|
袁野
|
9c40c8845b
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
41b9b90fea
|
1
|
2 years ago |
|
袁野
|
1f7f95208e
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
8cfcbf7e5e
|
1
|
2 years ago |
|
袁野
|
c47dcae421
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
dd09bd4671
|
1
|
2 years ago |
|
袁野
|
ac617dd66e
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
37f8c49407
|
1
|
2 years ago |
|
袁野
|
bbe9c0e452
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
dab3fa0453
|
修改话费定时任务问题
|
2 years ago |
|
袁野
|
06e2a1402e
|
api需求上传
|
2 years ago |
|
袁野
|
59fc152281
|
Merge branch 'api-dev' of http://139.159.177.244:3000/hurui/hai-server into api-dev
|
2 years ago |
|
袁野
|
2d32f0d5fe
|
1
|
2 years ago |
|
袁野
|
40da39a651
|
Merge branch 'api-dev' of http://139.159.177.244:3000/hurui/hai-server into api-dev
|
2 years ago |
|
袁野
|
0b60dfa57b
|
api需求上传
|
2 years ago |
|
袁野
|
2cba9e02f3
|
1
|
2 years ago |
|
袁野
|
7b1c52cf06
|
1
|
2 years ago |
|
袁野
|
fe142c4113
|
1
|
2 years ago |
|
袁野
|
5ca65c7614
|
1
|
6 years ago |
|
袁野
|
fa9f0f3fc0
|
1
|
7 years ago |
|
袁野
|
2a72da3dc0
|
1
|
2 years ago |
|
袁野
|
1c029b978d
|
1
|
2 years ago |
|
袁野
|
acb01b829c
|
Merge branch 'api-dev' of http://139.159.177.244:3000/hurui/hai-server into api-dev
|
2 years ago |
|
袁野
|
a63618bbcc
|
1
|
2 years ago |
|
袁野
|
a5b48c1068
|
Merge branch 'master' into api-dev
* master: (29 commits)
修改话费订单导出
修改话费订单导出
提交代码
修改话费订单导出
提交代码
提交代码
提交代码
提交代码
修改话费订单导出
提交代码
修改话费订单导出
提交文件
提交代码
提交代码
提交代码
提交代码
修改短信话术 修改 修改工会卡终端号
1
提交代码
修改短信话术 修改 修改工会卡终端号
...
# Conflicts:
# hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
# hai-service/src/main/java/com/hai/config/RechargeConfig.java
# hai-service/src/main/java/com/hai/service/impl/HltUnionCardVipServiceImpl.java
|
2 years ago |
|
袁野
|
564b0d91ef
|
修改请求接口
|
2 years ago |
|
袁野
|
0b97b5a52e
|
修改请求接口
|
2 years ago |
|
袁野
|
cc7d71d29a
|
修改话费订单导出
|
2 years ago |
|
袁野
|
eff9736db2
|
修改话费订单导出
|
2 years ago |
|
袁野
|
727d10aa5d
|
修改话费订单导出
|
2 years ago |
|
袁野
|
113c282d22
|
Merge remote-tracking branch 'origin/api-dev' into api-dev
|
2 years ago |
|
袁野
|
d6d6d3c420
|
修改话费订单导出
|
2 years ago |
|
袁野
|
0765647741
|
修改话费订单导出
|
2 years ago |
|
袁野
|
831e5c9c63
|
修改话费订单导出
|
2 years ago |
