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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java

@@ -51,7 +51,7 @@
   public void changeSex(AcceptData acceptData, Integer sex, PrintWriter out) {

      try {

         // 获取设备定义性别

          deviceSexService.save(acceptData.getDevice(), sex);

         deviceSexService.save(acceptData.getDevice(), sex);

         JSONObject data = new JSONObject();

         data.put("sex", sex);

         out.print(JsonUtil.loadTrueResult(data));