Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantEntryActivitesQueryInfo.java → mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantEntryActivitiesQueryInfo.java

@@ -7,7 +7,7 @@ import java.util.Date;
 import com.ym.mec.biz.dal.entity.TenantEntryActivities.SuitableUser;
 import com.ym.mec.common.page.QueryInfo;
 
-public class TenantEntryActivitesQueryInfo extends QueryInfo {
+public class TenantEntryActivitiesQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "开始时间", required = false)
 	private Date startDate;

mec-biz/src/main/java/com/ym/mec/biz/service/UploadFileService.java

@@ -27,7 +27,7 @@ public class UploadFileService {
 	private StoragePlugin storagePlugin;
 
 	/** 最大上传大小，单位kb */
-	@Value("${common.upload.maxSize:51200}")
+	@Value("${common.upload.maxSize:153600}")
 	private int maxSize;
 
 	/** 支持的扩展名 */

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TenantEntryActivitiesController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.page.TenantEntryActivitesQueryInfo;
+import com.ym.mec.biz.dal.page.TenantEntryActivitiesQueryInfo;
 import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.controller.BaseController;
 
@@ -24,7 +24,7 @@ public class TenantEntryActivitiesController extends BaseController {
 
     @ApiOperation(value = "分页查询活动列表")
     @GetMapping("/queryPage")
-    public Object queryPage(TenantEntryActivitesQueryInfo queryInfo) {
+    public Object queryPage(TenantEntryActivitiesQueryInfo queryInfo) {
     	queryInfo.setDelFlag(false);
     	queryInfo.setStartDate(new Date());
         return succeed(tenantEntryActivitiesService.queryPage(queryInfo));

mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitiesController.java

@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.TenantEntryActivities;
+import com.ym.mec.biz.dal.page.TenantEntryActivitiesQueryInfo;
 import com.ym.mec.biz.service.TenantEntryActivitiesService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 
 @RequestMapping("tenantEntryActivities")
 @Api(tags = "租客入驻活动")
@@ -29,7 +29,7 @@ public class TenantEntryActivitiesController extends BaseController {
 	@ApiOperation(value = "分页查询活动列表")
 	@GetMapping("/queryPage")
 	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/queryPage')")
-	public Object queryPage(QueryInfo queryInfo) {
+	public Object queryPage(TenantEntryActivitiesQueryInfo queryInfo) {
 		return succeed(tenantEntryActivitiesService.queryPage(queryInfo));
 	}