ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit e0c988d060619c65de3bcb97a38fdd1cc8908284 2 parents bba54671 850357f1

Merge branch 'test6.8.3' into test6.8.4

Inline Side-by-side
Showing 5 changed files with 10 additions and 7 deletions
... ... @@ -22,7 +22,7 @@
and word_type = #{wordType}
</if>
<if test="clientType != null">
and client_type = #{clientType}
and (client_type = #{clientType} or client_type = 2)
</if>
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
... ...
... ... @@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd ">
http://www.springframework.org/schema/mvc/spring-mvc.xsd ">
<mvc:resources mapping="/easyui/**" location="/easyui/" />
<mvc:resources mapping="/html/**" location="/html/" />
... ... @@ -45,4 +45,8 @@
</property> -->
</bean>
<mvc:cors>
<mvc:mapping path="/**" />
</mvc:cors>
</beans>
\ No newline at end of file
... ...
... ... @@ -12,7 +12,7 @@ redis.readonly.proxy.port=6379
redis.readonly.proxy.auth=
erp.domain=http://192.168.102.47:9098/erp-gateway-web
erp.domain=http://192.168.102.47:9098
# ******************** message ********************
... ... @@ -39,4 +39,4 @@ inbox.baseurl = http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gate
ip.port.uic.server = java-yoho-uic.test3.ingress.dev.yohocorp.com
ufo.live.notify.url = http://testapi.yohops.com/ufoLive/ufo_avthumb_notify
\ No newline at end of file
ufo.live.notify.url = http://testapi.yohops.com/ufoLive/ufo_avthumb_notify
... ...
... ... @@ -9,7 +9,7 @@
<td>
<select id="wordType" class="easyui-combobox" name="wordType"
style="margin-left: 10px;width: 200px ">
<option value="0" selected="selected">热搜词</option>
<option value="0">热搜词</option>
<option value="1">默认搜索词</option>
</select>
</td>
... ... @@ -67,7 +67,7 @@
$("#orderByTR").show();
}else {
$("#orderByTR").hide();
$('#orderBy').combobox('clear');
$('#orderBy').attr("value" , "");
}
}
}
... ...
... ... @@ -33,7 +33,6 @@
<option value="">选择展示平台</option>
<option value="0">APP</option>
<option value="1">小程序</option>
<option value="2">小程序、APP</option>
</select>
<select id="wordType" class="easyui-combobox" style="width:150px;" >
<option value="">选择搜索词类型</option>
... ...