Merge branch 'xiaoyang' into dev

wanshenmean

昨天 2db17e312a9bf0cff60917104447260b86178ca2

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs

@@ -548,6 +548,9 @@
                    break;
                case HtmlElementType.like:
                    linqExpression = LinqExpressionType.Contains;
                    break;

                case HtmlElementType.notequal:
                    linqExpression = LinqExpressionType.NotEqual;
                    break;
                default:
                    linqExpression = LinqExpressionType.Equal;