Merge remote-tracking branch 'origin/master'

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ProjectPackageHistoryModelDTO.java

@@ -31,6 +31,10 @@
     */
    private String pyName;
    /**
     * 模型中文名称
     */
    private String pyChineseName;
    /**
     * 包名
     */
    private String pkgName;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/entity/ProjectPackageHistoryModelEntity.java

@@ -29,6 +29,10 @@
     */
    private String pyName;
    /**
     * 模型中文名称
     */
    private String pyChineseName;
    /**
     * 包名
     */
    private String pkgName;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java

@@ -319,6 +319,7 @@
            entity.setProjectId(projectId);
            entity.setPackageHistoryId(historyId);
            entity.setPyName(e.getPyName());
            entity.setPyChineseName(e.getPyChineseName());
            entity.setPkgName(e.getPkgName());
            entity.setPyModule(e.getPyModule());
            entity.setRemark(e.getRemark());

 iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml

@@ -109,6 +109,7 @@
    <select id="getProjectModel" resultMap="mpkFile">
        SELECT
            t3.*,
            t4.id method_id,
            t4.method_name,
            t4.data_length,
            t4.model,
@@ -127,12 +128,7 @@
        FROM
            (
                SELECT
                    t2.id,
                    t2.py_name,
                    t2.pkg_name,
                    t2.py_module,
                    t2.remark,
                    t2.create_date
                    t2.*
                FROM
                    t_mpk_project_model t1
                        LEFT JOIN t_mpk_file t2 ON t1.model_id = t2.id