Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git

Conflicts:
	wchatplatform/Controllers/Inhouse/User/userController.class.php
	wchatplatform/Tpl/Inhouse/Exchange/changeScuessList.tpl
	wchatplatform/Tpl/Inhouse/Exchange/exchangeGoods.tpl
	wchatplatform/Tpl/Inhouse/Exchange/getExchangeList.tpl
	wchatplatform/Tpl/Inhouse/Exchange/locationCheck.tpl
	wchatplatform/Tpl/Inhouse/Exchange/userExchangeRecord.tpl
	wchatplatform/Tpl/Inhouse/User/register.tpl
	weixin_crm/templates_c/274775e19e7868a9c2fd10273045731d7ca43b2a.file.weixinuser.tpl.php
	weixin_crm/templates_c/323348291c1e2e4ee0840c94abcb00a98dd962cc.file.login.tpl.php
	weixin_crm/templates_c/691d35c9e76c861809954ee525c4b808d08dcecf.file.setAccount.tpl.php
	weixin_crm/templates_c/a66561162f9713804972005ac545445992e01b3e.file.userEdit.tpl.php
	weixin_crm/templates_c/b71d6ed1832efdf6cd9fbc55bb55ffa0092a6353.file.index.tpl.php
	weixin_crm/templates_c/cf828b9e23155e41696b4ac0242fb9a5f814379e.file.orderAdd.tpl.php
	weixin_crm/templates_c/d0e4d34ac2ef16403800d45c2040c98d7a8ec5c4.file.admin.tpl.php
	weixin_crm/templates_c/d1e649af577e59cd29ff10cadc43d8d707466adc.file.left.tpl.php
Signed-off-by: ShiinaMinatus <xij1111@gmail.com>
提交crm修改

Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm.git

Conflicts:
	weixin_crm/config/database.php
	weixin_crm/templates_c/b71d6ed1832efdf6cd9fbc55bb55ffa0092a6353.file.index.tpl.php
	weixin_crm/templates_c/d1e649af577e59cd29ff10cadc43d8d707466adc.file.left.tpl.php

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>