Merge remote-tracking branch 'origin/master'

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -352,6 +352,7 @@
             <if test="certificateTypeIdCode != null and certificateTypeIdCode != ''">certificateTypeIdCode = #{certificateTypeIdCode},</if>
             <if test="certificateNumber != null and certificateNumber != ''">certificateNumber = #{certificateNumber},</if>
             <if test="srzUserid != null and srzUserid != ''">srzUserid = #{srzUserid},</if>
+            <if test="strUserId != null and strUserId != ''">strUserId = #{strUserId},</if>
             <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson = #{isMappingPerson},</if>
             <if test="units != null and units != ''">units = #{units},</if>
             update_time = sysdate()
@@ -422,6 +423,7 @@
         <if test="certificateTypeIdCode != null and certificateTypeIdCode != ''">certificateTypeIdCode,</if>
         <if test="certificateNumber != null and certificateNumber != ''">certificateNumber,</if>
         <if test="srzUserid != null and srzUserid != ''">srzUserid,</if>
+        <if test="strUserId != null and strUserId != ''">strUserId,</if>
         <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson,</if>
         <if test="units != null and units != ''">units,</if>
         create_time
@@ -459,6 +461,7 @@
         <if test="certificateTypeIdCode != null and certificateTypeIdCode != ''">#{certificateTypeIdCode},</if>
         <if test="certificateNumber != null and certificateNumber != ''">#{certificateNumber},</if>
         <if test="srzUserid != null and srzUserid != ''">#{srzUserid},</if>
+        <if test="strUserId != null and strUserId != ''">#{strUserId},</if>
         <if test="isMappingPerson != null and isMappingPerson != ''">#{isMappingPerson},</if>
         <if test="units != null and units != ''">#{units},</if>
         sysdate()