45 Commits (ceef36a7d10206337f7c2ed40d2f8c34e1030e46)

Author SHA1 Message Date
zhengyongxing bd9af09830 市场结算管理bug修正 4 years ago
chenzhi c76cf038cd 己方公司 5 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
5 years ago
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
5 years ago
chenzhi ca551b9c50 己方公司新增搜索项目 5 years ago
chenzhi b28231d12f 优化己方公司返回 5 years ago
chenzhi 31ef129b2d 修复己方公司不能删除 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
tping 9fd06c27d3 Merge branch 'hotfix/alipaytoalipay' into feature/platfrom_aggregate_finance
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing 1c5a02594a 身份认证后台添加 5 years ago
chenzhi ba9468fedc 新增打款配置 5 years ago
chenzhi 748ec401f3 新增打款配置1 5 years ago
zhengyongxing 2a54b0ed08 汇付宝添加支付宝与微信 5 years ago
zhengyongxing 541ec17db5 隐藏威富通添加汇付宝 5 years ago
sunke 163ad97d60 支付限额 5 years ago
sunke 817b39c391 支付限额 5 years ago
sunke 68572d10e6 支付限额 5 years ago
sunke ab1c99d95a 时间 5 years ago
sunke dfb83d35d0 时间样式 5 years ago
sunke 098caeaa90 时间样式 5 years ago
sunke 4f98f9fabe 样式控制 5 years ago
sunke fa70a3c77a 限制规则 5 years ago
sunke ac54bb41a4 支付限额导出 5 years ago
sunke 5c8221d9dc 支付限额 5 years ago
zhanglingsheng efdba69f60 易宝支付配置 5 years ago
zhanglingsheng 31466db00d 支付类型添加易宝支付 5 years ago
liuweiwen 305cbf34cd 导航高亮 5 years ago
liuweiwen 5b63a2fe84 Merge remote-tracking branch 'origin/release' into release 5 years ago
liuweiwen f6af63ca3e 合同期限为空时间格式,公司信息导航高亮 5 years ago
zhanglingsheng 9afd27cdc6 Merge branch 'hosfix/tool_pay' into release 5 years ago
yulingwei dfe52865bd upt 5 years ago
jbRotk a6b1194be0 解决冲突 5 years ago
jbRotk 72cfd9ec64 新增渠道费率 5 years ago
liuweiwen c92fa425d2 内部公司信息管理 5 years ago
chenzhi dbc0e00132 合并 5 years ago
liuweiwen ed706c1b86 公司信息管理加提示 5 years ago
zhanglingsheng 4043cc04e6 支付设置--添加支付限额 5 years ago
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
zhengchanglong 505e12beab Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 602fb33fcc 新增需求:管理后台-》系统-》扩展工具-》公司信息管理 5 years ago
zhanglingsheng 5ea753b595 支付宝设置添加公钥私钥 5 years ago
zhanglingsheng ede4cdd96e 短信配置 5 years ago
zhanglingsheng 3f8168c11a 添加新短信 5 years ago
ELF 2ffa024c4c initial 5 years ago