gongbiao
|
bf9bf53653
|
Merge tag 'refs/tags/jenkins-back-end-2693' into release
develop
|
pirms 6 gadiem |
gongbiao
|
afdde35a66
|
[BUG][修改][测试环境:清结算-短信和邮件,编号显示错误,应显示settleNumber:字段]
|
pirms 6 gadiem |
luozukai
|
21a7b6782c
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
Burce
|
476c34e705
|
[调整]接口参数校验和异常处理
|
pirms 6 gadiem |
luozukai
|
81ee86c620
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
gongbiao
|
ec2dc17902
|
[BUG][修改][测试环境:商户账单下-“花花美食店”商户有账单数据但是在商户账单没显示]
|
pirms 6 gadiem |
luozukai
|
e1b6190cb7
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
gongbiao
|
36c27ce814
|
Merge tag 'refs/tags/jenkins-back-end-2685' into release
develop
|
pirms 6 gadiem |
gongbiao
|
7d8ed4ac27
|
[分账账户][修改][删除功能]
|
pirms 6 gadiem |
gongbiao
|
1a5661decc
|
[商户账单][修改][查询时过滤商户名为空字符串]
|
pirms 6 gadiem |
gongbiao
|
883cd15e22
|
[业态分析][修改][打印商铺面积日志]
|
pirms 6 gadiem |
gongbiao
|
727c6d4000
|
[业态分析][修改][打印商铺面积日志]
|
pirms 6 gadiem |
luozukai
|
bed371cdf7
|
Merge commit 'e5b2f4ac2d82b63a7683c4d01c9317fb74c8fc12' into release
|
pirms 6 gadiem |
luozukai
|
e5b2f4ac2d
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
gongbiao
|
a004022ea0
|
[业态分析][修改][打印合同ID日志]
|
pirms 6 gadiem |
gongbiao
|
43ebf03e63
|
[业态分析][修改][排除未计租的合同]
|
pirms 6 gadiem |
gongbiao
|
42ec11e23d
|
[业态分析][修改][排除未计租的合同]
|
pirms 6 gadiem |
luozukai
|
ea5351b264
|
Merge commit '3bda9d3e28d6b850d9f41d239c4c6391de01545b' into release
# Conflicts:
# mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
|
pirms 6 gadiem |
luozukai
|
3bda9d3e28
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
luozukai
|
5c1e5f4c10
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
luozukai
|
c5f11c66a2
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
luozukai
|
05ec17472f
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
gongbiao
|
2a298e4e04
|
[业态分析][修改][排除未计租的合同]
|
pirms 6 gadiem |
gongbiao
|
41db740a46
|
[账单][修改][导入其他押金时欠缴金额]
|
pirms 6 gadiem |
luozukai
|
682cba1159
|
[修改][结算单][修改跳点率计算]
|
pirms 6 gadiem |
luozukai
|
b9acb65b59
|
[修改][结算单][修改业态分析]
|
pirms 6 gadiem |
gongbiao
|
b214e001bf
|
[BUG][修改][开发环境:商户列表数据展示问题-多商户显示]
|
pirms 6 gadiem |
gongbiao
|
3b7a214e91
|
[分账账户][修改][同一个商场下有不同商户使用同一个账户不能删除微信账户]
|
pirms 6 gadiem |
luozukai
|
0c29c1de24
|
Merge commit 'f518a74c25aa662d087bf883a997622e3f538b36' into release
|
pirms 6 gadiem |
luozukai
|
f518a74c25
|
[修改][结算单][修改业态分析]
|
pirms 6 gadiem |
Burce
|
70a2b8359f
|
[调整]接口参数校验和异常处理
|
pirms 6 gadiem |
gongbiao
|
60b06519de
|
[账单][修改][导入其他押金时欠缴金额]
|
pirms 6 gadiem |
gongbiao
|
7f2e09add2
|
[BUG][修改][ID1002333 测试环境:结算单管理创建-金额显示问题]
|
pirms 6 gadiem |
Stormeye Wu
|
eace924f12
|
[C][修改]:coupon/detail优化
|
pirms 6 gadiem |
Stormeye Wu
|
8f3f3e9c00
|
[C][修改]:coupon/detail优化
|
pirms 6 gadiem |
luozukai
|
7282cf0bbc
|
[修改][结算单][修改业态分析]
|
pirms 6 gadiem |
Stormeye Wu
|
f86a7d8234
|
[C][修改]:filter计时
|
pirms 6 gadiem |
Stormeye Wu
|
65324de93d
|
[/api/wxCoupon/detail][修改]:优化detail访问
|
pirms 6 gadiem |
Burce
|
30d7e5d4a3
|
[优化]用户积分接口授权校验
|
pirms 6 gadiem |
luozukai
|
4ec97e97fc
|
Merge commit 'ab8506cb479e94dd0304cb8c61410062eb7cb8d7' into release
|
pirms 6 gadiem |
luozukai
|
c8b51128fa
|
[修改][结算单][修改账单列表名称]
|
pirms 6 gadiem |
luozukai
|
b9a68e974c
|
[修改][结算单][修改账单列表名称]
|
pirms 6 gadiem |
Burce
|
ab8506cb47
|
[调整]商户发券异常时提示券名称
|
pirms 6 gadiem |
luozukai
|
aaa8555123
|
[修改][结算单][修改账单列表名称]
|
pirms 6 gadiem |
luozukai
|
c3a1b1ed10
|
[修改][结算单][修改商户账单列表]
|
pirms 6 gadiem |
luozukai
|
0a2c2c88d4
|
[修改][结算单][修改商户账单列表]
|
pirms 6 gadiem |
Stormeye Wu
|
d4d471d5ba
|
Merge tag 'refs/tags/jenkins-back-end-2663' into release
develop
|
pirms 6 gadiem |
Stormeye Wu
|
b7cdac049c
|
[积分][修改]:积分兑换问题修复
|
pirms 6 gadiem |
Burce
|
f464f337cf
|
[调整]商户发券微信手机号授权校验 测试用例
|
pirms 6 gadiem |
Burce
|
16e18dba03
|
[调整]商户发券微信手机号授权校验
|
pirms 6 gadiem |