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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

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

            }



            // 用户等级更新