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

admin

2019-12-20 c96375400afce5cd0be41e8af0eb7e8deb484994

 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();

            }



            // 用户等级更新