Merge remote-tracking branch 'origin/eta/2.3' into debug

services/data/data_approve/approve.go

@@ -985,7 +985,7 @@ func DataApproveCancel(DataApproveId, adminId int, adminName string) (msg string
 		return
 	}
 
-	if approveItem.State != DataApproveStatePass {
+	if approveItem.State == DataApproveStatePass {
 		msg = "审批单已通过，不允许撤回"
 		err = fmt.Errorf("审批单已通过，不允许撤回")
 		return