Merge branch 'feature/0124' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantActivationCodeWrapper.java

@@ -108,9 +108,6 @@ public class TenantActivationCodeWrapper {
         @ApiModelProperty("周期")
         private Integer purchaseCycle;
 
-        @ApiModelProperty("周期类型")
-        private String purchaseType;
-
         @ApiModelProperty("机构专辑采购ID")
         private Long tenantAlbumPurchaseId;