weigang
|
22ef7439dd
|
Merge branch 'speaker' into order
合并speaker进当前分支
# Conflicts:
# app/Model/Order.php
# app/Model/OrderMain.php
# composer.json
# config/autoload/dependencies.php
# config/routes.php
|
5 years ago |
|
weigang
|
5ef2076b74
|
外卖订单下单
|
5 years ago |
Mike
|
8e01b4e319
|
修改log host地址
|
5 years ago |
|
weigang
|
c46c142f64
|
循环播报
|
5 years ago |
|
weigang
|
b81edf8cd5
|
订单或设备号异常直接ACK应答
|
5 years ago |
|
weigang
|
cae320969f
|
新增IS_BIND字段相关调整
|
5 years ago |
|
weigang
|
ba181d6fb3
|
语音播报订单不存在或设备号不存在打回消息队列
|
5 years ago |
|
weigang
|
2b3adc7245
|
语音播报订单流程走完
|
5 years ago |
|
Mike
|
f8f90aa0bf
|
绑定和service添加
|
5 years ago |
|
Mike
|
5d6a9aec0f
|
完成amqp对接
|
5 years ago |
|
Mike
|
22cd1ea655
|
创建播报机路由和controller
|
5 years ago |
|
Mike
|
a31168d1a6
|
Merge branch 'log' into speaker
* log:
创建日志类
# Conflicts:
# app/Controller/TestController.php
# composer.json
|
5 years ago |
|
Mike
|
9bd0f9b216
|
创建日志类
|
5 years ago |
|
Mike
|
cb16f46f1a
|
add ali iot vendor
|
5 years ago |
 DESKTOP-GG6FIN9\Administrator
|
6683c2c1c1
|
Merge branch 'hotfix_coupon'
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
a480eaa3df
|
优惠券库存
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
864ac85c06
|
Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
03dc6a8e28
|
Merge branch 'hotfix_coupon' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
0c2e2f054c
|
优惠券库存
|
5 years ago |
|
weigang
|
81e2b9f5d2
|
Merge branch 'coupon_rebate' into develop
# Conflicts:
# config/autoload/middlewares.php
# config/routes.php
|
5 years ago |
|
weigang
|
1b5a51e1ad
|
处理跨域
|
5 years ago |
|
weigang
|
2c354269fc
|
Merge branch 'coupon_rebate' into develop
# Conflicts:
# Envoy.blade.php
# composer.json
# config/autoload/dependencies.php
# config/routes.php
|
5 years ago |
|
Mike
|
82cdae3c02
|
嗯，paramstoken临时代码
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
c9ab982e68
|
新增控制器
|
5 years ago |
|
weigang
|
85a68ce1a7
|
Merge branch 'master' into service_evaluate
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
fb8fb266b5
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
56f820d851
|
修改 快捷评论
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
c5f9720524
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
9fbab2f737
|
修改查询多余判断
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
2289b7999d
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
b35ee7fe58
|
增加服务专员状态判断
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
a3a62cb86f
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
02f5c6d17f
|
修改验证器
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
ceada23213
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
d377125162
|
Merge branch 'service_evaluate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into service_evaluate
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
187cee6e8e
|
增加服务专员状态拦截
|
5 years ago |
|
weigang
|
f19a76b4e3
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
weigang
|
651ae53f68
|
占位符
|
5 years ago |
|
weigang
|
f222eb47b6
|
Merge branch 'service_evaluate' into develop
# Conflicts:
# app/Listener/ValidatorFactoryResolvedListener.php
|
5 years ago |
|
weigang
|
7af79c3d1f
|
新增两个验证规则：存在且可用和和当前另外一个字段不等（用于排己等）
|
5 years ago |
|
weigang
|
806f70e9c1
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
weigang
|
2b79b89d00
|
修改字符串长度计算方式，把中文字当一个字符处理
|
5 years ago |
|
weigang
|
626dc231ff
|
Merge branch 'develop' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into develop
|
5 years ago |
|
weigang
|
0da5bbcf72
|
Merge branch 'attachment' into develop
文件上传OSS基础代码
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
503f530229
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
a2001c34df
|
Merge branch 'service_evaluate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into service_evaluate
|
5 years ago |
|
DESKTOP-GG6FIN9\Administrator
|
6365251c15
|
转时间戳全部在后端执行 优化获取用户信息方法
|
5 years ago |
|
weigang
|
bd3999c88a
|
Merge branch 'service_evaluate' into develop
|
5 years ago |
|
weigang
|
430c6fe919
|
between规则对字符串计算有bug，自定义一个规则计算
|
5 years ago |
|
weigang
|
d5e066466c
|
图片、文件上传基础接口
|
5 years ago |
