fix some bug

Author: Sven

SwiftJSONModeler For Xcode.xcodeproj/project.pbxproj

@@ -579,7 +579,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.1;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lifu.SwiftJSONModeler;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -601,7 +601,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.3.1;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lifu.SwiftJSONModeler;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

SwiftJSONModeler For Xcode/YApi/YApiCreator.swift

@@ -118,7 +118,7 @@ class YApiCreator {
             comment = "/// \(objectDes)\(isShowMock && !object.mock.isEmpty ? "\tMock:\(object.mock)" : "")"
         }
         if swiftType == "<#Undefined#>" {
-            swiftType = object.typeRaw
+            swiftType = "<#\(object.typeRaw)#>"
         }
         var line = "var \(object.key!): \(swiftType)"
         let isOptional = !config.isNotOptional
@@ -168,7 +168,7 @@ class YApiCreator {
         }
         let lines = yapiLines.map{ "\t\($0)" }
         objctLines.append(contentsOf: lines)
-        if (commandIdentifier == classFromRAWCommand && commandIdentifier == classFromYApiIdCommand), parent.contains("HandyJSON") {
+        if keyword == keyClass , parent.contains("HandyJSON") {
             objctLines.append("")
             objctLines.append("\trequired init() { }")
         }