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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml

@@ -183,7 +183,7 @@
      AND

      yeh.`hb_uid` = #{uid}

      AND

      FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m-%d') =

      FROM_UNIXTIME(UNIX_TIMESTAMP(yeh.hb_create_time),'%Y-%m-%d') =

      FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m-%d');

   </select>



@@ -203,7 +203,7 @@
      AND

      yeh.`hb_uid` = #{uid}

      AND

      FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m') =

      FROM_UNIXTIME(UNIX_TIMESTAMP(yeh.hb_create_time),'%Y-%m') =

      FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m');

   </select>