Merge remote-tracking branch 'origin/master-果昔项目' into master-果昔项目

# Conflicts:
#	device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -1013,6 +1013,18 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         deviceAnnualFee.run(deviceInfos);
         String log = String.format("商户设备授权：授权商户：%s,授权设备：%s", auth.getMercId() + "," + auth.getMercName(), deviceIds.size() == 0 ? "取消所有设备授权" : CollUtil.join(deviceIds, ","));
         return R.ok(Boolean.TRUE).setLogMsg(log);
+        //复制私库商品到设备
+        copyGoodsToDevice(mercId, deviceIds);
+        return R.ok(Boolean.TRUE);
+    }
+
+    /**
+     * 复制私库商品到设备
+     * @param mercId
+     * @param deviceIds
+     */
+    public void  copyGoodsToDevice(Long mercId , List<Long> deviceIds){
+        R.feignCheck (goodsDeviceService.copyGoodsToDevice(new GoodsDeviceDto.CopyGoodsToDeviceDTO().setDeviceIds(deviceIds).setMercId(mercId)));
     }
 
     /**