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

Dev

See merge request quanshu/mp-server!156

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -197,7 +197,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
       ticketPackage.setStartSn(
           ticketPackage.getPkgNo() + "-" + String.format("%1$07d", ticketCnt + 1));
       ticketPackage.setEndSn(
-          ticketPackage.getPkgNo() + "-" + String.format("%1$07d", ticketCnt + 200));
+          ticketPackage.getPkgNo() + "-" + String.format("%1$07d", ticketCnt + pkgUnit));
       ticketPackage.setStatus(TicketPkgStatusEnum.FOR_SALE);
       ticketPackageList.add(ticketPackage);
 

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelCommission.java

@@ -35,7 +35,7 @@ public class ChannelCommission implements Serializable {
   /**
    * 用户订单ID
    */
-  @TableField("order_item_id")
+  @TableField("order_id")
   private String orderId;
 
   /**