LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch20211008' into branch20211008

Browse Source
This commit is contained in:
zhangqinlin
2021-10-22 17:48:23 +08:00
parent d45c01f6d8 b34621ca1f
commit fc944a6e37
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
+2 -2
View File
@@ -30,8 +30,8 @@ public enum MessageUrlEnums {
C_OPEN_TYPE6("C_OPEN_TYPE6","component","MessagePage/MeetingDetailModal"),
C_OPEN_TYPE7("C_OPEN_TYPE7","component","MessagePage/MeetingDetailModal"),
C_OPEN_TYPE8("C_OPEN_TYPE8","",""),
C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
C_OPEN_TYPE10("C_OPEN_TYPE10","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu="),
C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
C_OPEN_TYPE10("C_OPEN_TYPE10","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+2 -2
View File
@@ -273,8 +273,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailBillData.getEmail()));
}
if(!StringUtils.isBlank(payMailBillData.getContactMobile())){
sendMessageDTO.setToUser(payMailBillData.getContactMobile());
sendMessageDTO.setPhone(payMailBillData.getContactMobile());
sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailBillData.getContactMobile()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailBillData.getContactMobile()));
}
HashMap<String,String> map = new HashMap<>();
map.put("projectName",payMailBillData.getProjectName());