Commit Graph

3899 Commits

Author SHA1 Message Date
苏尹岚
7cbce85665 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-10 11:48:18 +08:00
苏尹岚
62569dfe55 导入Excel更新京西价,推荐商品 2019-12-10 11:47:52 +08:00
gazebo
bf597331f4 资源图片允许GIF 2019-12-10 11:35:13 +08:00
gazebo
f3a94938aa GetStores的vendorStoreConds规则修改,添加vendorOrgCode查询支持 2019-12-10 10:38:54 +08:00
gazebo
70b1dc74d3 Merge branch 'master' of e.coding.net:rosydev/jx-callback 2019-12-10 10:00:15 +08:00
gazebo
992381c795 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-10 09:59:47 +08:00
gazebo
ade9a674f4 +GetVendorOrgCodeInfo 2019-12-10 09:59:29 +08:00
gazebo
87e8aec310 准备切换thing_map,IsUseThingMap 2019-12-10 09:43:08 +08:00
苏尹岚
3229e3db25 修改权限修改 2019-12-10 09:16:38 +08:00
苏尹岚
a5151fc73e 修改营业范围 2019-12-10 08:45:52 +08:00
gazebo
46d3d7d8f0 fk 2019-12-09 18:52:52 +08:00
苏尹岚
bda15efb88 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 18:52:52 +08:00
苏尹岚
729eafd927 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 18:51:29 +08:00
苏尹岚
f1aea16c2e 导出平台门店 2019-12-09 18:50:38 +08:00
gazebo
6be99b903a jd specialDistrictMap 2019-12-09 18:35:25 +08:00
苏尹岚
4ef840788b Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 18:08:40 +08:00
苏尹岚
57babd9b32 未营业门店,授权,改营业范围 2019-12-09 18:08:06 +08:00
gazebo
c07eb1142e ThingMap.SyncStatus小驼峰 2019-12-09 17:53:40 +08:00
gazebo
75a2833510 分类与sku返回mapList信息 2019-12-09 17:37:56 +08:00
gazebo
8b33ec5f5a 修复上次提交处理平台vendorOrgCode的bug 2019-12-09 15:45:09 +08:00
gazebo
ecedbe9be4 京东api区分vendorOrgCode 2019-12-09 15:16:21 +08:00
苏尹岚
3dfbb88e30 美团readstore修改 2019-12-09 14:37:19 +08:00
苏尹岚
a92d5b799b 美团readstore修改 2019-12-09 14:18:17 +08:00
苏尹岚
27fedb0d95 美团readstore城市名 2019-12-09 14:07:27 +08:00
苏尹岚
6bac5f9ae1 美团readstore城市名 2019-12-09 14:06:20 +08:00
苏尹岚
1fca6a4c7c readStore增加城市名 2019-12-09 13:52:18 +08:00
苏尹岚
211994bd97 导出未营业门店 2019-12-09 13:37:24 +08:00
苏尹岚
ec6945a457 推荐商品 2019-12-09 11:44:27 +08:00
苏尹岚
45481c825e 推荐商品 2019-12-09 11:42:29 +08:00
苏尹岚
78bdb3fb19 推荐商品 2019-12-09 11:38:49 +08:00
苏尹岚
0b95e6546f 推荐商品 2019-12-09 11:24:38 +08:00
苏尹岚
745f1c8a4b Accept Merge Request #63: (yonghui -> mark)
Merge Request: 导出平台未营业门店
Created By: @苏尹岚
Accepted By: @苏尹岚
URL: https://rosydev.coding.net/p/jx-callback/d/jx-callback/git/merge/63
2019-12-09 11:08:58 +08:00
gazebo
7995f507b1 用新京东回调接口
GetAPIByAppKey
2019-12-09 11:05:00 +08:00
苏尹岚
0380394030 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 10:49:18 +08:00
苏尹岚
cbd050d02d 导出各平台未营业门店 2019-12-09 10:49:02 +08:00
gazebo
992711c5c2 restore 2019-12-09 10:38:50 +08:00
苏尹岚
ac9a98c6b9 推荐商品 2019-12-09 09:58:36 +08:00
苏尹岚
8947ae38cb Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 09:51:58 +08:00
苏尹岚
459253c31a 推荐商品 2019-12-09 09:51:39 +08:00
gazebo
a78bce0bbb fk 2019-12-09 09:48:58 +08:00
苏尹岚
202d1997a1 Merge remote-tracking branch 'origin/mark' into yonghui 2019-12-09 09:47:30 +08:00
苏尹岚
751dcc6040 推荐商品 2019-12-09 09:47:15 +08:00
gazebo
52a4fd756f Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-09 09:39:17 +08:00
gazebo
0587e883e0 京东回调api切换至新接口 2019-12-09 09:38:53 +08:00
苏尹岚
5d1f128e1d 价格统计 2019-12-09 09:31:34 +08:00
gazebo
441fa5e3d8 fk 2019-12-08 18:47:15 +08:00
gazebo
554f3cb319 启用自动完成内部自提单 2019-12-08 18:30:05 +08:00
gazebo
769a66a08a 自动完成内部自提单 2019-12-08 17:49:26 +08:00
gazebo
6226b19e96 Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark 2019-12-08 17:47:43 +08:00
gazebo
63c01887d9 up 2019-12-07 23:53:54 +08:00