gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
This commit is contained in:
duandongmei
2018-08-19 15:55:27 +08:00
parent 8c7e1d088d 8db613d464
commit 45556b7e05
27 changed files with 1118 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
View File

@@ -15,11 +15,12 @@
<result column="config_hex" property="configHex" jdbcType="VARCHAR" />
<result column="config_expr_type" property="configExprType" jdbcType="VARCHAR" />
<result column="config_match_method" property="configMatchMethod" jdbcType="VARCHAR" />
<result column="config_service_type" property="configServiceType" jdbcType="VARCHAR" />
</resultMap>
<sql id="Base_Column_List" >
dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
,config_multi_keywords,config_hex,config_expr_type,config_match_method
,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type
</sql>
<select id="getList" resultMap="BaseResultMap" >
select