156 Commits

Author SHA1 Message Date
ba0cae119f 退货失败-- 2020-09-22 10:17:45 +08:00
467ca23848 退货失败-- 2020-09-22 10:03:37 +08:00
4c4b6cf1db Merge branch 'test' 2020-09-22 10:02:41 +08:00
2f3f1399da 退货失败 2020-09-22 10:02:32 +08:00
4d50da2443 Merge branch 'test' 2020-09-22 09:55:41 +08:00
8af760c9d1 退货失败 2020-09-22 09:55:26 +08:00
63aa29c5f2 退货失败 2020-09-22 09:19:30 +08:00
d2593d1c87 修改 2020-09-21 08:15:51 +08:00
539afccbc7 注销相关逻辑 2020-09-14 20:49:23 +08:00
e1630850b1 顺带件排序 2020-08-31 09:47:58 +08:00
59aacbb71b 下单展示付款方式 2020-08-29 23:21:58 +08:00
55d6d91a9a Merge branch 'test' 2020-08-29 10:23:18 +08:00
4184b2c7bc 代慢计算1% 2020-08-29 10:23:07 +08:00
45014bce8d Merge branch 'test' 2020-08-26 22:19:35 +08:00
3bfbd5c0c1 代慢计算1% 2020-08-26 22:17:06 +08:00
e2e1a442b0 极限兼容 2020-08-26 22:02:05 +08:00
d2d439f940 兼容 2020-08-26 20:35:31 +08:00
2f3acf0aeb Merge branch 'test'
# Conflicts:
#	hyhproject/app/controller/Note.php
2020-08-24 22:58:14 +08:00
3dcd915a90 傻了TAT 2020-08-24 22:56:48 +08:00
8f058ff445 2222222222222222222 2020-08-24 22:49:23 +08:00
351f664b8e 代码异常 2020-08-22 21:55:30 +08:00
ccf07ecb2f 账号注销登录提示 2020-08-22 21:54:57 +08:00
252a83f578 账号注销:除手机验证 2020-08-22 21:52:24 +08:00
fd55825f52 收款信息 2020-08-22 21:20:51 +08:00
6fb1da3141 还款日设置 2020-08-22 21:00:23 +08:00
2383d24c12 切换显示内容 2020-08-19 13:07:59 +08:00
7179dbdd11 交易规则内容 2020-08-19 13:01:12 +08:00
01c0302b8a 交易规则内容 2020-08-19 12:57:20 +08:00
da8b0d7268 后台交易规则添加 2020-08-16 15:33:22 +08:00
cfacbe3954 交易规则list 2020-08-16 15:16:43 +08:00
68663ed74d 烂笔头记账新增 2020-08-16 15:03:26 +08:00
c74f56a43b 烂笔头新增 2020-08-16 14:05:34 +08:00
07b19eca22 记账,新增修改 2020-08-15 18:00:03 +08:00
ce095b2382 烂笔头 2020-08-15 18:00:03 +08:00
de9d4a1fc4 记账,新增修改 2020-08-15 17:59:10 +08:00
6fa32ec4d0 烂笔头 2020-08-15 17:59:10 +08:00
36b0b97322 Merge branch 'test' 2020-07-16 10:31:14 +08:00
edc9ca954a 文案修改 2020-07-16 10:30:50 +08:00
179bdf62a1 Merge branch 'test' 2020-07-13 22:12:06 +08:00
ae973ff242 修改 2020-07-13 22:06:57 +08:00
902eed095d Merge branch 'test' 2020-07-13 21:57:58 +08:00
e484f0fc70 修改 2020-07-13 21:57:24 +08:00
00ff3ae2df Merge branch 'test' 2020-07-05 14:48:20 +08:00
f2c1f6f6e9 处理 2020-07-05 14:47:44 +08:00
277dd708aa Merge branch 'test'
# Conflicts:
#	hyhproject/admin/controller/LogSysData.php
#	hyhproject/admin/model/CashDraws.php
#	hyhproject/admin/view/log_sys_data/log_sys_data.js
#	hyhproject/admin/view/log_sys_data/log_sys_data2.js
#	hyhproject/common/model/SysSummary.php
2020-07-04 21:37:51 +08:00
a700e533bc 修正 2020-06-29 21:47:54 +08:00
64b8bf8ca5 108.1 2020-06-21 17:54:12 +08:00
9d339215b0 列表添加字段 2020-06-16 20:57:28 +08:00
b636b24c67 数据库存储备注 2020-06-16 20:41:46 +08:00
d5c3775f2f 点击商城后台可以刷新 2020-06-14 23:52:03 +08:00