Merge branch 'pollex-dev' into sit

wayne

2022-01-26 6fa4bba623713c396432ba8b863846883d6a1906

 PAMapp/plugins/filters/date.filter.ts

@@ -29,9 +29,9 @@
  if (isThisYear(date)) {
    return isToday(date)
          ? `今天 ${date.getHours()}:${minutes}`
          : `${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${minutes}`;
          : `${date.getMonth() + 1}/${date.getDate()} ${date.getHours()}:${minutes}`;
  } else {
    return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${minutes}`;
    return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()} ${date.getHours()}:${minutes}`;
  };

})