Merge remote-tracking branch 'origin/score_shop' into developer

姜友瑶

2022-05-17 e11162164d7b136e9de4c4b2e378b108cd87859f

 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("删除成功");
    }