Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ServiceDaoMapper.xml

@@ -95,10 +95,10 @@
     </insert>
 
     <insert id="insertServiceVersion" keyProperty="id" useGeneratedKeys="true">
-        insert into service_version(service_id, version, model, description, image, resource, replicas, mount_path, env_variables,
+        insert into service_version(service_id, version, model, description, image, resource, computing_resource_id, replicas, mount_path, env_variables,
                                     code_config, command, create_by, update_by, deploy_type)
         values (#{serviceVersion.serviceId}, #{serviceVersion.version}, #{serviceVersion.model}, #{serviceVersion.description}, #{serviceVersion.image},
-                #{serviceVersion.resource}, #{serviceVersion.replicas}, #{serviceVersion.mountPath}, #{serviceVersion.envVariables},
+                #{serviceVersion.resource}, #{serviceVersion.computingResourceId}, #{serviceVersion.replicas}, #{serviceVersion.mountPath}, #{serviceVersion.envVariables},
                 #{serviceVersion.codeConfig}, #{serviceVersion.command}, #{serviceVersion.createBy}, #{serviceVersion.updateBy}, #{serviceVersion.deployType})
     </insert>
 
@@ -136,6 +136,9 @@
             <if test="serviceVersion.resource != null and serviceVersion.resource !=''">
                 resource = #{serviceVersion.resource},
             </if>
+            <if test="serviceVersion.computingResourceId != null">
+                computing_resource_id = #{serviceVersion.computingResourceId},
+            </if>
             <if test="serviceVersion.replicas != null">
                 replicas = #{serviceVersion.replicas},
             </if>