Merge remote-tracking branch 'origin/master'

 iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/MmPredictItemDao.xml

@@ -72,6 +72,7 @@
        <result property="itemname" column="ITEMNAME"/>
        <result property="itemtypeid" column="ITEMTYPEID"/>
        <result property="itemtypename" column="ITEMTYPENAME"/>
        <result property="predictlength" column="predictlength"/>
        <result property="granularity" column="GRANULARITY"/>
        <result property="isfuse" column="ISFUSE"/>
        <result property="workchecked" column="WORKCHECKED"/>
@@ -93,6 +94,7 @@
        TMPI.ITEMNAME,
        TMPI.ITEMTYPEID,
        TMIT.ITEMTYPENAME,
        TMPI.predictlength,
        TMPI.GRANULARITY,
        TMPI.ISFUSE,
        TMPI.WORKCHECKED,