Merge branch 'ty_fix' into alpha

Helius

2021-11-08 15500d265a59ad3b7b7679276a83d9c5c92598dd

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