Commit Graph

23 Commits

Author SHA1 Message Date
liuyingfang
87fb7091b4 实体类 2023-06-13 10:38:15 +08:00
liuyingfang
df26d12b1c Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
# Conflicts:
#	pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
2023-06-13 10:34:40 +08:00
liuyingfang
5f1fd5bdbe pos付款相关 2023-06-13 10:31:11 +08:00
韩鹏辉
b0104531df Merge remote-tracking branch 'origin/master' 2023-06-13 10:10:21 +08:00
韩鹏辉
0dba7bcfb9 添加pos 机退款接口 2023-06-13 10:08:57 +08:00
liuyingfang
cbad5d16b7 Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui 2023-06-12 16:14:05 +08:00
liuyingfang
3dae9f31e4 pos相关 2023-06-12 16:13:52 +08:00
韩鹏辉
02b3038538 新增拉卡拉退款接口 2023-06-12 14:59:24 +08:00
hankaikai
b370133857 "拉卡拉进件支付代码" 2023-06-09 16:26:53 +08:00
hankaikai
2527ffb4af "拉卡拉进件支付代码" 2023-06-09 15:24:35 +08:00
liuyingfang
fd84e2d469 更改文字,更改AppGuide字段,实名逻辑更改,收银点判断逻辑更改,RSA相关 2023-06-06 18:23:13 +08:00
hankaikai
c29c10c193 "拉卡拉进件支付代码" 2023-06-01 17:14:02 +08:00
hankaikai
b7793fe1ff "设备规格修改" 2023-05-23 11:38:33 +08:00
liuyingfang
01335276c7 后台协议添加,快递鸟相关常数,正式服务器相关参数改动,快递鸟相关接口,苹果相关cid配置,改变提示,登录接口改为post请求,微信跳转连接 2023-05-22 16:34:08 +08:00
liuyingfang
4a5bc0dd25 收银呗改为快银收银,部分调整 2023-05-08 11:00:47 +08:00
liuyingfang
6491ed9c7f pos缺失VO 2023-04-13 09:29:49 +08:00
lyf
a5db6104bb 银盛相关所有 2023-04-07 14:01:27 +08:00
lyf
38d3ad79c8 pos支付相关 2023-03-28 18:05:39 +08:00
lyf
d4e283b08d 主菜单部分功能 2023-02-23 09:51:03 +08:00
lyf
ff900668b2 '认证相关对接差不多' 2023-02-09 14:10:51 +08:00
lyf
496b5bce2e 反扫调试结束 2023-02-03 14:45:03 +08:00
lyf
b9b0330659 进件相关调试 2023-02-02 15:23:04 +08:00
junshuai
62548736a7 add file 2022-07-23 13:54:07 +08:00