Merge branch 'wei_master' into '105'

Wei master

See merge request !36

src/main/resources/mybatis/mapping/informationMapper.xml

@@ -26,7 +26,7 @@
             t_kzy_relation_class rc
         LEFT JOIN t_kzy_information i ON rc.relation_id = i.id
         WHERE
-            i.is_delete = 0
+            i.is_delete = 0 AND rc.type=2
         AND rc.first_class_id = #{firstId,jdbcType=BIGINT}
         GROUP BY i.id
 

src/main/resources/servers/105/application.properties

@@ -46,7 +46,7 @@ wx.app.id=wxe37f12b1fa076c1a
 wx.app.secret=57e45975dff8f558163e5e9f2ac78e87
 
 
-wx.http.url=http://kzy-wx.jimijiayuan.cn
+wx.http.url=http://kzy-wx-1.jimijiayuan.cn
 #有拍云
 remoteFileUrl = http://yxvzb.b0.upaiyun.com/
 upyun.bucket=yxvzb

src/main/resources/servers/local/application.properties

@@ -49,7 +49,7 @@ wx.app.id=wxe37f12b1fa076c1a
 wx.app.secret=57e45975dff8f558163e5e9f2ac78e87
 
 
-wx.http.url=http://kzy-wx.jimijiayuan.cn
+wx.http.url=http://kzy-wx-1.jimijiayuan.cn
 #有拍云
 remoteFileUrl = http://yxvzb.b0.upaiyun.com/
 upyun.bucket=yxvzb