Merge remote-tracking branch 'origin/master'

zss

2024-06-07 73507854f0618fe7f96c93aa64b870ff9c44664a

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -114,7 +114,8 @@
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -163,7 +164,8 @@
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -220,9 +222,10 @@
               ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               inspection_item_class,
               inspection_item_class_en,
               ip.factory ip_factory,
               ip.laboratory ip_laboratory,
               ip.sample_type ip_sample_type,
@@ -266,7 +269,6 @@
        select ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -317,7 +319,8 @@
        select ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -366,7 +369,8 @@
        select ip.id ip_id,
               inspection_item,
               inspection_item_en,
               inspection_item_classify,
               inspection_item_class,
               inspection_item_class_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               ip.factory ip_factory,
@@ -440,9 +444,10 @@
        <id property="id" column="ip_id" jdbcType="INTEGER"/>
        <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
        <result property="inspectionItemEn" column="inspection_item_en" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
        <result property="inspectionItemSubclassEn" column="inspection_item_subclass_en" jdbcType="VARCHAR"/>
        <result property="inspectionItemClass" column="inspection_item_class" jdbcType="VARCHAR"/>
        <result property="inspectionItemClassEn" column="inspection_item_class_en" jdbcType="VARCHAR"/>
        <result property="factory" column="ip_factory" jdbcType="VARCHAR"/>
        <result property="laboratory" column="ip_laboratory" jdbcType="VARCHAR"/>
        <result property="sampleType" column="ip_sample_type" jdbcType="VARCHAR"/>