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

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java

@@ -121,6 +121,7 @@
               da.setMac(mac);

               deviceActiveService.addDeviceActive(da);

            } catch (Exception e) {

               e.printStackTrace();

            }



            // 用户等级更新