You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Stormeye Wu
8c7f73c600
Merge tag 'refs/tags/jenkins-back-end-1724' into release
develop
# Conflicts:
# mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
# mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
# mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
# mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java
# mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
# mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
# mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
# mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
# mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml
|
7 years ago |
| .. |
|
java/com/iformall
|
Merge tag 'refs/tags/jenkins-back-end-1724' into release
|
7 years ago |
|
resources
|
[合同优化][修改][修复数据]
|
7 years ago |
