Code

兼容 7.2 代码改进#22

Code

Open

weijer wants to merge 41 commits intoWuKongOpenSource:masterWuKongOpenSource/WukongCRM-9.0-PHP:masterfrom weijer:7.2Copy head branch name to clipboard

+6,189-383,093

Commits

Commits on Jun 4, 2019

• 分离后台前端代码

  

  weijer

  committed
  171ab2e

  Copy full SHA for 171ab2e

• 删除后台前端代码

  

  weijer

  committed
  cb37b9a

  Copy full SHA for cb37b9a

• 移除vendor包

  

  weijer

  committed
  f6bf3a6

  Copy full SHA for f6bf3a6

• 移除英文说明

  

  weijer

  committed
  cc7ced9

  Copy full SHA for cc7ced9

• 移除thinkphp文件夹

  

  weijer

  committed
  859b22a

  Copy full SHA for 859b22a

• 兼容php7.2

  

  weijer

  committed
  4323059

  Copy full SHA for 4323059

• 兼容php7.2改进

  

  weijer

  committed
  bd58f5c

  Copy full SHA for bd58f5c

• 兼容php7.2改进

  

  weijer

  committed
  fbf9b5e

  Copy full SHA for fbf9b5e

• 兼容php7.2改进

  

  weijer

  committed
  7ed5a6b

  Copy full SHA for 7ed5a6b

• bug 修复

  

  weijer

  committed
  7bf50a6

  Copy full SHA for 7bf50a6

• bug 修复 array_intersect

  

  weijer

  committed
  e45f021

  Copy full SHA for e45f021

• bug 修复 为空数据判断

  

  weijer

  committed
  52e83ef

  Copy full SHA for 52e83ef

• 微信登录

  mickyXiong

  committed
  ef0456b

  Copy full SHA for ef0456b

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_xs

  mickyXiong

  committed
  22426e6

  Copy full SHA for 22426e6

Commits on Jun 5, 2019

• phpexcel 替换 PhpSpreadsheet

  

  weijer

  committed
  69643e2

  Copy full SHA for 69643e2

• 微信绑定

  mickyXiong

  committed
  6767ef7

  Copy full SHA for 6767ef7

• 修改代码明显错误

  

  weijer

  committed
  4eace1c

  Copy full SHA for 4eace1c

• 微信绑定

  mickyXiong

  committed
  fda2422

  Copy full SHA for fda2422

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_xs

  mickyXiong

  committed
  a1492cd

  Copy full SHA for a1492cd

• Merge branch 'dev_weijer' into 'master'

  Show description for 02455b7
  weijer

  committed
  02455b7

  Copy full SHA for 02455b7

• 添加用户微信openid

  mickyXiong

  committed
  215fc99

  Copy full SHA for 215fc99

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_xs

  Show description for d6fdcfa
  mickyXiong

  committed
  d6fdcfa

  Copy full SHA for d6fdcfa

• Merge branch 'dev_xs' into 'master'

  Show description for e3ced0f
  weijer

  committed
  e3ced0f

  Copy full SHA for e3ced0f

• wechat登录密码无需加密验证

  mickyXiong

  committed
  e32ebc4

  Copy full SHA for e32ebc4

Commits on Jun 6, 2019

• 移除session

  Show description for 833805c
  

  weijer

  committed
  833805c

  Copy full SHA for 833805c

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_weijer

  Show description for 567ca61
  

  weijer

  committed
  567ca61

  Copy full SHA for 567ca61

• Merge branch 'dev_weijer' into 'master'

  Show description for c88de67
  weijer

  committed
  c88de67

  Copy full SHA for c88de67

• 微信注册

  mickyXiong

  committed
  f5feb45

  Copy full SHA for f5feb45

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_weijer

  Show description for 76b17c7
  

  weijer

  committed
  76b17c7

  Copy full SHA for 76b17c7

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into 7.2

  

  weijer

  committed
  876143c

  Copy full SHA for 876143c

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_weijer

  Show description for d645e9d
  

  weijer

  committed
  d645e9d

  Copy full SHA for d645e9d

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_weijer

  Show description for 1c33fee
  

  weijer

  committed
  1c33fee

  Copy full SHA for 1c33fee

• Merge branch '7.2' into 'master'

  Show description for 5ac953b
  weijer

  committed
  5ac953b

  Copy full SHA for 5ac953b

• Merge branch 'dev_xs' of http://192.168.88.65:18080/jgy/jgy_72crm into 7.2

  Show description for 714c334
  

  weijer

  committed
  714c334

  Copy full SHA for 714c334

• Merge branch '7.2' into 'master'

  Show description for 6aa2d61
  weijer

  committed
  6aa2d61

  Copy full SHA for 6aa2d61

• wechat登录密码无需加密验证

  mickyXiong

  committed
  97ee2ac

  Copy full SHA for 97ee2ac

• string_random 函数

  

  weijer

  committed
  a36d755

  Copy full SHA for a36d755

• Merge branch '7.2' into 'master'

  Show description for ab09556
  weijer

  committed
  ab09556

  Copy full SHA for ab09556

• 合并代码

  mickyXiong

  committed
  e9bb6d8

  Copy full SHA for e9bb6d8

• Merge branch 'master' of http://192.168.88.65:18080/jgy/jgy_72crm into dev_xs

  Show description for 2ea8f79
  mickyXiong

  committed
  2ea8f79

  Copy full SHA for 2ea8f79

• Merge branch 'dev_xs' into 'master'

  Show description for 3080509
  weijer

  committed
  3080509

  Copy full SHA for 3080509