Merge remote-tracking branch 'origin/master'

doum

11 小时以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

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

@@ -132,7 +132,7 @@
    @Override
    public void deleteById(Integer id) {
        Activity activity = new Activity();
        activity.setIsdeleted(Constants.ZERO);
        activity.setIsdeleted(Constants.ONE);
        activity.setId(id);
        activityMapper.updateById(activity);
    }