Merge remote-tracking branch 'origin/master'

rk

4 小时以前 b53ce008646cc62e0a0f10f4743fb6a73a6ee8bb

Merge remote-tracking branch 'origin/master'

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java

@@ -211,9 +211,11 @@
    @Override
    public void updateStatusById(Labels labels) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        labels.setEditDate(new Date());
        labels.setEditor(user.getId());
        labelsMapper.updateById(labels);
        labelsMapper.update(null,new UpdateWrapper<Labels>().lambda()
                .set(Labels::getEditDate,new  Date())
                .set(Labels::getEditor,user.getId())
                .set(Labels::getStatus,labels.getStatus())
                .eq(Labels::getId,labels.getId()));
    }



 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -466,7 +466,6 @@
        return accountResponse;
    }


    @Override
    public AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest){
        try {