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

mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java

@@ -89,7 +89,7 @@ public class WxDeviceServiceImpl implements WxDeviceService {
             wxDeviceMapper.insertSelective(record);
         } else {
             record.setUpdateDate(new Date());
-            if (record.getConfig() != null) {
+            if (record.getConfig() != null && record.getType() != null){
                 if (!checkConfig(record.getType(),record.getConfig())) {
                     return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
                 }