Merge branch 'crm/crm_15.9.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/rai_serve.go

@@ -1172,7 +1172,7 @@ func (this *RaiServeCoAntroller) RemarkList() {
 		case "cygx_user_feedback":
 			item.RemarkType = "交流反馈（" + v.RealName + "）"
 		default:
-			item.RemarkType = "历史备注"
+			item.RemarkType = "备注"
 		}
 		resp.List = append(resp.List, item)
 	}