Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/AchieveRuleAction.java

@@ -92,7 +92,7 @@
    @GetMapping("/removeById/{id}")
    public AjaxResult removeById(@PathVariable Long id) {
        achieveRuleDao.deleteById(id);
        return AjaxResult.buildFailInstance("删除成功");
        return AjaxResult.buildSuccessInstance("删除成功");
    }