Commit Graph

297 Commits (a763b96199442bd1687c90468145e9df75bed574)

Author SHA1 Message Date
chenzhi 518d2aa3f6 优化操作日志表结构
zhengyongxing 3c628fa1c6 统计日志添加
chenzhi 50e4185d9c 操作日志-登陆记录
chenzhi 6dfb13e4d9 新增操作权限
zhanglingsheng 2c7eb8f191 支付类型添加易宝支付
zhanglingsheng 31466db00d 支付类型添加易宝支付
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
ELF dad83c8d38 押金付款方式添加选项
zhengyongxing 4f65efad9b 结算单管理添加审核状态
liuweiwen f6af63ca3e 合同期限为空时间格式,公司信息导航高亮
chenzhi 43a3beae23 合并财务分类汇总
sunke b191bdec8e sql
yulingwei e26f517df1 冲突解决
yulingwei 747bba16b0 汇总结算单管理
zhengchanglong 7672e06b4b Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
zhengchanglong e1ab1eade6 更新SQL信息
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release
# Conflicts:
#	Data/update.sql
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release
liuweiwen e15460b08f 合作方
yulingwei dfe52865bd upt
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release
liuweiwen 7da5e25e16 合作方
yulingwei 469a037b0f merge
yulingwei 3c44d5d200 upt
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
chenzhi da2e3a769c 推广列表查看
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索
chenzhi 6a612565c6 扩展推广公司添加
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
zhengyongxing 955a1917b3 生成个人结算单的功能完成
chenzhi e497fb16ee 移除新增推广公司结构
chenzhi 52971b378f 新增推广公司表结构
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
zhengchanglong bdbbeab1a0 添加测试订单录入表
yulingwei e35f20ee70 游戏预警
ELF c95f771ba0 解决冲突
ELF 423b4ae77b 解决冲突
sunke f65ad73acf sql公司录入
sunke cec446b5ab sql
ELF bbb31890f6 未收押金会长禁用落地页/下载页
ELF ed25d54dc8 解决冲突
ELF 501b8099d4 解决冲突
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新
yulingwei a10a21c12b update sql remark
liaojinling e596d11cee 会长押金
jbRotk a6b1194be0 解决冲突
jbRotk 5d315d4182 添加工会类型
zhengchanglong 8b33a52cd0 修改奖罚记录字段顺序
jbRotk 2e4f1edb5a 修改sql
liuweiwen eb30abd06a 更新sql语句