Merge branch 'dev_处理立刻清空和撤销删除' into dev_st

# Conflicts:
#	CustomKeyboard/Utils/KBBackspaceLongPressHandler.m
解决冲突

keyBoard/Class/Pay/M/KBPayProductModel.m

@@ -17,12 +17,12 @@
 
 - (NSString *)coinsDisplayText {
     NSString *name = self.name ?: @"";
-    NSString *unit = self.unit ?: @"";
-    if (name.length && unit.length) {
-        return [NSString stringWithFormat:@"%@ %@", name, unit];
+//    NSString *unit = self.unit ?: @"";
+    if (name.length) {
+        return [NSString stringWithFormat:@"%@", name];
     }
     if (name.length) { return name; }
-    if (unit.length) { return unit; }
+//    if (unit.length) { return unit; }
     return @"";
 }