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

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

@@ -29,6 +29,12 @@
             <if test="resourceOccupy.deduceCredit != null">
                 deduce_credit = #{resourceOccupy.deduceCredit},
             </if>
+            <if test="resourceOccupy.computingResourceId != null">
+                computing_resource_id = #{resourceOccupy.computingResourceId},
+            </if>
+            <if test="resourceOccupy.creditPerHour != null">
+                credit_per_hour = #{resourceOccupy.creditPerHour},
+            </if>
             <if test="resourceOccupy.description != null and resourceOccupy.description !=''">
                 description = #{resourceOccupy.description},
             </if>