Merge branch 'dev' into 'mp-server-test'

创建盲票

See merge request quanshu/mp-server!71

mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwards.java

@@ -23,7 +23,7 @@ public class TicketAwards implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "awards_id" , type = IdType.AUTO)
+  @TableId(value = "awards_id" , type = IdType.INPUT)
   private String awardsId;
 
   /**