166 Commits

Author SHA1 Message Date
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
780b32c29e 改回 2020-06-14 22:12:04 +08:00
30ceeed8dd 修正:代快付值=每一笔优惠款的90% 2020-06-14 21:29:10 +08:00
7439174e15 验证 2020-06-12 07:32:20 +08:00
20163e34fa 时间格式化 2020-06-12 07:30:55 +08:00
f966ab2735 列表3修改 2020-06-12 07:14:59 +08:00
bd1450f7d4 3 2020-06-11 15:31:04 +08:00
ee64884c9d 有点坑 2020-06-11 14:08:26 +08:00
8095e46c2d 列表修改 2020-06-10 13:32:34 +08:00
fbc49be499 13 2020-06-10 13:32:34 +08:00
df910a1777 展示页按钮 2020-06-10 13:32:34 +08:00
d633094b83 列表页 2020-06-10 13:32:34 +08:00
6b848dced3 5 2020-06-10 13:32:33 +08:00
72d0ec0bbf 2 2020-06-10 13:32:33 +08:00
63a988c828 1 2020-06-10 13:32:33 +08:00
255e66d5c5 解决部分问题 2020-06-10 13:32:33 +08:00
85df5bcc9d TradeRule后台完成 2020-06-10 13:32:33 +08:00
d8f717dde4 TradeRule后台完成 2020-06-10 13:32:33 +08:00
fe37d065c7 TradeRule后台完成 2020-06-10 13:32:33 +08:00
4854268cd2 TradeRule后台完成 2020-06-10 13:32:33 +08:00
d5f22242de 记账创建新增过程 2020-06-10 13:32:32 +08:00
9627c2b9b4 新增接口 2020-06-10 13:32:32 +08:00
2c8468e7fc TradeRule后台接口,待对接 2020-06-10 13:32:32 +08:00
6a207b50a8 TradeRule后台添加大体 2020-06-10 13:32:32 +08:00
e81134b3ab 大体接口 2020-06-10 13:32:32 +08:00
6b1a584cdb 大体接口 2020-06-10 13:32:32 +08:00
9b39e781fc 导出 2020-06-10 13:32:32 +08:00
fa010cea41 逻辑更改 2020-06-10 13:32:31 +08:00
68bb82fe30 逻辑更改 2020-06-10 13:32:31 +08:00
69f7ad7a86 逻辑更改 2020-06-10 13:32:31 +08:00
a8b1c746c5 IP判断 2020-06-10 13:32:31 +08:00
7015ca6535 不显示0 2020-06-10 13:32:31 +08:00
2bbd74be87 显示负数值券 2020-06-10 13:32:31 +08:00
Your Name
13ee1a3610 bulabula 2020-06-10 13:32:29 +08:00
a9ad9b69ae 更新 2020-06-10 13:32:26 +08:00
Your Name
47ba4bb2cd Merge branch 'test' of ssh://git.qgmzbxs.com:23333/q792602257/qlg.backend into test 2020-06-10 13:27:47 +08:00
Your Name
3d19b6129b 乱丢 2020-06-10 13:23:50 +08:00
Your Name
1371b0a37a Merge branch 'master' of ssh://git.qgmzbxs.com:23333/q792602257/qlg.backend into test
the commit.
2020-06-10 13:21:39 +08:00
f48ab07f2f 列表修改 2020-06-09 20:11:02 +08:00
5e7214345f 13 2020-06-09 19:23:29 +08:00
0bdba706ee 展示页按钮 2020-06-09 16:45:08 +08:00