fix: 代码合并异常处理

application/models/Otable.php

@@ -2035,4 +2035,30 @@ class otable extends CI_Model
     {
         return oo::$config['dbindex'] . "api_config.t_new_user_collect_config";
     }
+    /**
+     * 推金币活动收集物概率
+     * @return string
+     */
+    public static function coinPushPro(): string
+    {
+        return oo::$config['dbindex'] . "api_config.t_coin_push_pro";
+    }
+
+    /**
+     * jackpot 分组表
+     * @return string
+     */
+    public static function jackpotGroups(): string
+    {
+        return oo::$config['dbindex'] . "api_config.t_jackpot_groups";
+    }
+
+    /**
+     * jackpot 分组权重表
+     * @return string
+     */
+    public static function jackpotGroupsWeights(): string
+    {
+        return oo::$config['dbindex'] . "api_config.t_jackpot_groups_weights";
+    }
 }