Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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