Compare commits

..

No commits in common. "c7aa6007f529c884acc12a8710da825abbfb0ec9" and "081ea43753f362f644390cfcda9e560faff979ea" have entirely different histories.

18 changed files with 39 additions and 39 deletions

View File

@ -1,4 +1,4 @@
package com.zhyc.module.dairyProducts.dryMatterCorrection.controller; package com.zhyc.module.dryMatterCorrection.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -16,8 +16,8 @@ import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.common.enums.BusinessType; import com.zhyc.common.enums.BusinessType;
import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService; import com.zhyc.module.dryMatterCorrection.service.IXzDryMatterCorrectionService;
import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo; import com.zhyc.common.core.page.TableDataInfo;

View File

@ -1,4 +1,4 @@
package com.zhyc.module.dairyProducts.dryMatterCorrection.domain; package com.zhyc.module.dryMatterCorrection.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

View File

@ -1,7 +1,7 @@
package com.zhyc.module.dairyProducts.dryMatterCorrection.mapper; package com.zhyc.module.dryMatterCorrection.mapper;
import java.util.List; import java.util.List;
import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
/** /**
* 干物质校正Mapper接口 * 干物质校正Mapper接口

View File

@ -1,7 +1,7 @@
package com.zhyc.module.dairyProducts.dryMatterCorrection.service; package com.zhyc.module.dryMatterCorrection.service;
import java.util.List; import java.util.List;
import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
/** /**
* 干物质校正Service接口 * 干物质校正Service接口

View File

@ -1,11 +1,11 @@
package com.zhyc.module.dairyProducts.dryMatterCorrection.service.impl; package com.zhyc.module.dryMatterCorrection.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zhyc.module.dairyProducts.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper; import com.zhyc.module.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper;
import com.zhyc.module.dairyProducts.dryMatterCorrection.domain.XzDryMatterCorrection; import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
import com.zhyc.module.dairyProducts.dryMatterCorrection.service.IXzDryMatterCorrectionService; import com.zhyc.module.dryMatterCorrection.service.IXzDryMatterCorrectionService;
/** /**
* 干物质校正Service业务层处理 * 干物质校正Service业务层处理

View File

@ -1,4 +1,4 @@
package com.zhyc.module.dairyProducts.parityCorrection.controller; package com.zhyc.module.parityCorrection.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -16,8 +16,8 @@ import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.common.enums.BusinessType; import com.zhyc.common.enums.BusinessType;
import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; import com.zhyc.module.parityCorrection.domain.XzParityCorrection;
import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService; import com.zhyc.module.parityCorrection.service.IXzParityCorrectionService;
import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo; import com.zhyc.common.core.page.TableDataInfo;

View File

@ -1,4 +1,4 @@
package com.zhyc.module.dairyProducts.parityCorrection.domain; package com.zhyc.module.parityCorrection.domain;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;

View File

@ -1,7 +1,7 @@
package com.zhyc.module.dairyProducts.parityCorrection.mapper; package com.zhyc.module.parityCorrection.mapper;
import java.util.List; import java.util.List;
import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; import com.zhyc.module.parityCorrection.domain.XzParityCorrection;
/** /**
* 胎次校正Mapper接口 * 胎次校正Mapper接口

View File

@ -1,7 +1,7 @@
package com.zhyc.module.dairyProducts.parityCorrection.service; package com.zhyc.module.parityCorrection.service;
import java.util.List; import java.util.List;
import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; import com.zhyc.module.parityCorrection.domain.XzParityCorrection;
/** /**
* 胎次校正Service接口 * 胎次校正Service接口

View File

@ -1,11 +1,11 @@
package com.zhyc.module.dairyProducts.parityCorrection.service.impl; package com.zhyc.module.parityCorrection.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zhyc.module.dairyProducts.parityCorrection.mapper.XzParityCorrectionMapper; import com.zhyc.module.parityCorrection.mapper.XzParityCorrectionMapper;
import com.zhyc.module.dairyProducts.parityCorrection.domain.XzParityCorrection; import com.zhyc.module.parityCorrection.domain.XzParityCorrection;
import com.zhyc.module.dairyProducts.parityCorrection.service.IXzParityCorrectionService; import com.zhyc.module.parityCorrection.service.IXzParityCorrectionService;
/** /**
* 胎次校正Service业务层处理 * 胎次校正Service业务层处理

View File

@ -1,4 +1,4 @@
package com.zhyc.module.dairyProducts.weightCorrection.controller; package com.zhyc.module.weightCorrection.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -16,8 +16,8 @@ import com.zhyc.common.annotation.Log;
import com.zhyc.common.core.controller.BaseController; import com.zhyc.common.core.controller.BaseController;
import com.zhyc.common.core.domain.AjaxResult; import com.zhyc.common.core.domain.AjaxResult;
import com.zhyc.common.enums.BusinessType; import com.zhyc.common.enums.BusinessType;
import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; import com.zhyc.module.weightCorrection.domain.XzWegihCorrection;
import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService; import com.zhyc.module.weightCorrection.service.IXzWegihCorrectionService;
import com.zhyc.common.utils.poi.ExcelUtil; import com.zhyc.common.utils.poi.ExcelUtil;
import com.zhyc.common.core.page.TableDataInfo; import com.zhyc.common.core.page.TableDataInfo;

View File

@ -1,4 +1,4 @@
package com.zhyc.module.dairyProducts.weightCorrection.domain; package com.zhyc.module.weightCorrection.domain;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

View File

@ -1,7 +1,7 @@
package com.zhyc.module.dairyProducts.weightCorrection.mapper; package com.zhyc.module.weightCorrection.mapper;
import java.util.List; import java.util.List;
import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; import com.zhyc.module.weightCorrection.domain.XzWegihCorrection;
/** /**
* 称重校正Mapper接口 * 称重校正Mapper接口

View File

@ -1,7 +1,7 @@
package com.zhyc.module.dairyProducts.weightCorrection.service; package com.zhyc.module.weightCorrection.service;
import java.util.List; import java.util.List;
import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; import com.zhyc.module.weightCorrection.domain.XzWegihCorrection;
/** /**
* 称重校正Service接口 * 称重校正Service接口

View File

@ -1,11 +1,11 @@
package com.zhyc.module.dairyProducts.weightCorrection.service.impl; package com.zhyc.module.weightCorrection.service.impl;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zhyc.module.dairyProducts.weightCorrection.mapper.XzWegihCorrectionMapper; import com.zhyc.module.weightCorrection.mapper.XzWegihCorrectionMapper;
import com.zhyc.module.dairyProducts.weightCorrection.domain.XzWegihCorrection; import com.zhyc.module.weightCorrection.domain.XzWegihCorrection;
import com.zhyc.module.dairyProducts.weightCorrection.service.IXzWegihCorrectionService; import com.zhyc.module.weightCorrection.service.IXzWegihCorrectionService;
/** /**
* 称重校正Service业务层处理 * 称重校正Service业务层处理

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.dairyProducts.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper"> <mapper namespace="com.zhyc.module.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper">
<resultMap type="XzDryMatterCorrection" id="XzDryMatterCorrectionResult"> <resultMap type="XzDryMatterCorrection" id="XzDryMatterCorrectionResult">
<result property="id" column="id"/> <result property="id" column="id"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.dairyProducts.parityCorrection.mapper.XzParityCorrectionMapper"> <mapper namespace="com.zhyc.module.parityCorrection.mapper.XzParityCorrectionMapper">
<resultMap type="XzParityCorrection" id="XzParityCorrectionResult"> <resultMap type="XzParityCorrection" id="XzParityCorrectionResult">
<result property="id" column="id" /> <result property="id" column="id" />

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhyc.module.dairyProducts.weightCorrection.mapper.XzWegihCorrectionMapper"> <mapper namespace="com.zhyc.module.weightCorrection.mapper.XzWegihCorrectionMapper">
<resultMap type="XzWegihCorrection" id="XzWegihCorrectionResult"> <resultMap type="XzWegihCorrection" id="XzWegihCorrectionResult">
<result property="id" column="id" /> <result property="id" column="id" />