Merge remote-tracking branch 'origin/jsxswms' into jsxswms

zhou zhou

3 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

 src/main/resources/mapper/BasQualityTestingMapper.xml

@@ -4,7 +4,7 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasQualityTesting">
        <id column="id" property="id" />
        <result column="id" property="id" />
        <result column="box_specs" property="boxSpecs" />
        <result column="box_type" property="boxType" />