Merge branch 'master' into test

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

@@ -351,6 +351,8 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
             if (byId != null) {
                 return;
             }
+            MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(deviceInfo.getMercId())).getData();
+            deviceInfo.setMercName(merc.getName());
             deviceInfoService.save(deviceInfo);
         };
         //设备系统信息