Merge remote-tracking branch 'origin/test' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -197,7 +197,9 @@ public class MercMiniDeviceController {
         R checkR = this.checkDeviceByMerc(deviceInfo);
         if (checkR.getCode() == R.Enum.SUCCESS.getCode()) {
             Integer activeState = SysDictUtils.getValue(EnumDeviceActiveStatus.Code.CODE.getCode(), EnumDeviceActiveStatus.N_1.getCode(), Integer.class);
-            if (!deviceInfo.getActiveState().equals(activeState)) {
+            String refMercCode = deviceInfo.getMercCode();
+            //非质检商户需要进行判断，质检商户跳过
+            if (!"10001".equals(refMercCode) && !deviceInfo.getActiveState().equals(activeState)) {
                 return R.fail("机器未激活");
             }
             return R.ok();