Merge remote-tracking branch 'origin/master'

supervision-system/src/main/resources/mapper/bdglSecret/BdglSecretMapper.xml

@@ -134,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="people1Name != null">people1_name = #{people1Name},</if>
             <if test="people2Name != null">people2_name = #{people2Name},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
-            <if test="remarks != null">remarks = #{deptName},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="status != null">status = #{status},</if>
         </trim>
         where id = #{id}
     </update>