Merge remote-tracking branch 'origin/master'

doum

昨天 1c7c8e034add7e68602bdb56be08f63bac1262b7

 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);
    }