合并分支 'dev_2nd_period_test' 到 'master'

Dev 2nd period test 查看合并请求 laws-nio/laws-weilai!243
2022-11-09 20:31:44 +08:00
parent 3bac043816 e8223399ac
commit 8d3c533faf
14 changed files with 55 additions and 25 deletions
@@ -128,8 +128,8 @@
        pm.state as state,
        pm.project_id as project_id,
        pm.create_time as create_time,
-        pm.project_version as project_version,
-        concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name
+        pm.version as version,
+        concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name
        from params_manifest pm
        left join project_library_base as plb on plb.id = pm.project_id
        left join project_name_info as pni on plb.project_name_id = pni.id
@@ -22,9 +22,9 @@ public class ParamsManifestTodoCenterEO {
    private String title;

    /**
-     * 相关项目版本
+     * 相关清单版本
     */
-    private String projectVersion;
+    private String version;

    /**
     * 待发起数量 包括状态：待发起收集,变更,工程接口人退回