Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/resources/mapper/TabTodoItemMapper.xml

@@ -187,9 +187,9 @@
     <if test="enterpriseId != null ">
       and enterprise_id = #{enterpriseId}
     </if>
-    <if test="userId != null ">
-      and user_id = #{userId}
-    </if>
+<!--     <if test="userId != null ">
+       and user_id = #{userId}
+     </if>-->
     <if test="itemType != null ">
       and item_type = #{itemType}
     </if>