Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

pom.xml

@@ -380,6 +380,18 @@
             <artifactId>thumbnailator</artifactId>
             <version>0.4.14</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.huifu.adapay.core</groupId>
+            <artifactId>adapay-core-sdk</artifactId>
+            <version>1.2.10</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.huifu.adapay</groupId>
+            <artifactId>adapay-java-sdk</artifactId>
+            <version>1.2.10</version>
+        </dependency>
     </dependencies>
 
 </project>

src/main/java/com/izouma/nineth/domain/AirDrop.java

@@ -27,8 +27,8 @@ public class AirDrop extends BaseEntity {
     @ApiModelProperty("备注")
     private String remark;
 
-    @ApiModelProperty("空投类型")
     @Enumerated(EnumType.STRING)
+    @ApiModelProperty("空投类型")
     private AirDropType type;
 
     @ApiModelProperty("兑换券ID")

src/main/resources/templates/PayOrderPC.ftlh

@@ -31,7 +31,7 @@
     </div>
 </div>
 <script>
-    //var vConsole = new VConsole();
+    // var vConsole = new VConsole();
     var payParams = ${payParams?no_esc};
     payParams.package = payParams.packageValue;
     payParams.timestamp = payParams.timeStamp;
@@ -55,7 +55,7 @@
                 window.close();
             }
         });
-    }；
+    };
     payParams.fail = function (e) {
         console.log(e);
         showDialog({