Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

LAPTOP-RI7D261L\Mr Ke

2020-02-26 a92f3c4d10bebbdc55270e72ccd97cd1ba7d4e28

 SunshineLnsMinApp/pages/activityList/activityList.wxss

@@ -43,6 +43,7 @@
  flex-direction: columns;
  font-size: 12px;
  color: #8C9198;
  line-height: 39rpx;
}
.status-btn{
    height: 20px;