merge master

framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java

@@ -15,9 +15,8 @@ import javax.validation.constraints.Size;
  */
 @Data
 public class MemberAddDTO {
-
     @NotEmpty(message = "会员用户名必填")
-    @Size(min = 6, max = 30)
+    @Size(max = 30,message = "会员用户名最长30位")
     @ApiModelProperty(value = "会员用户名")
     private String username;
 

framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java

@@ -31,5 +31,4 @@ public interface MemberPointsHistoryService extends IService<MemberPointsHistory
      */
     IPage<MemberPointsHistory>  MemberPointsHistoryList(PageVO page, String memberId, String memberName);
 
-
 }

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java

@@ -24,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class MemberPointsHistoryServiceImpl extends ServiceImpl<MemberPointsHistoryMapper, MemberPointsHistory> implements MemberPointsHistoryService {
 
-
     @Override
     public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) {
         MemberPointsHistoryVO memberPointsHistoryVO = new MemberPointsHistoryVO();

framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java

@@ -114,7 +114,7 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService {
 
         IndexNoticeVO indexNoticeVO = new IndexNoticeVO();
         //商品审核
-        indexNoticeVO.setGoods(goodsService.goodsNum(GoodsStatusEnum.UPPER, GoodsAuthEnum.TOBEAUDITED));
+        indexNoticeVO.setGoods(goodsService.goodsNum(null, GoodsAuthEnum.TOBEAUDITED));
         //店铺入驻审核
         indexNoticeVO.setStore(storeService.auditNum());
         //售后申请