Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="authPerson != null">#{authPerson},</if>
             <if test="phone != null">#{phone},</if>
             <if test="updateBy != null">#{updateBy},</if>
-            <if test="protocol != null">#{protocol},</if>
+            1,
             NOW(),
             <if test="remark != null">#{remark},</if>
             <if test="companyId != null">#{companyId},</if>