Merge remote-tracking branch 'origin/master'

admin

2019-01-10 02d8f36a2a51a2ffcacdb619bee34077da61b328

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -517,10 +517,10 @@


            if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {

               // 本年

               contentJson.put("content", "最近登陆 " + sdf.format(lastLoginTime));

               contentJson.put("content", "最近登录 " + sdf.format(lastLoginTime));

            } else {

               // 往年

               contentJson.put("content", "最近登陆 " + format.format(lastLoginTime));

               contentJson.put("content", "最近登录 " + format.format(lastLoginTime));

            }



            array.add(contentJson);