Merge remote-tracking branch 'origin/master'

game-business/src/main/resources/mapper/business/AppGameMoneyMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAppGameMoney" parameterType="com.game.business.domain.AppGameMoney">
         update app_game_money
         <trim prefix="SET" suffixOverrides=",">
-            <if test="appGameId != null">app_game_id = #{appGame},</if>
+            <if test="appGameId != null">app_game_id = #{appGameId},</if>
             <if test="bettingMoney != null">betting_money = #{bettingMoney},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>

game-ui/src/views/business/game_item/index.vue

@@ -124,7 +124,7 @@
           <el-input v-model="form.itemMultiple" placeholder="请输入选项倍数" />
         </el-form-item>
         <el-form-item label="选项值" prop="itemLocation">
-          <el-input v-model="form.itemLocation" placeholder="请输入选项值" />
+          <el-input v-model="form.itemLocation" placeholder="请输入选项值" disabled/>
         </el-form-item>
         <el-form-item label="每期投注上限金额" prop="bettingMoney">
           <el-input v-model="form.bettingMoney" placeholder="请输入" />