Merge remote-tracking branch 'origin/master'

Controller/AccountController.py

@@ -251,7 +251,7 @@ def login():
 
 
         if user_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
         if user_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
             sms = SMSService()
             sms = SMSService()
-            result = sms.phoneSendCodeWithContent('18913573855', 934619, [user_info.phone], '灰兔智能')
+            result = sms.phoneSendCodeWithContent(['18913573855', '13912720828'], 934619, [user_info.phone], '灰兔智能')
             logger.info(result)
             logger.info(result)
 
 
         salt = AgentService.gene_salt()
         salt = AgentService.gene_salt()
@@ -296,7 +296,7 @@ def login():
 
 
             if agent_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
             if agent_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
                 sms = SMSService()
                 sms = SMSService()
-                result = sms.phoneSendCodeWithContent('18913573855', 934619, [agent_info.phone], '灰兔智能')
+                result = sms.phoneSendCodeWithContent(['18913573855', '13912720828'], 934619, [agent_info.phone], '灰兔智能')
                 logger.info(result)
                 logger.info(result)
 
 
             salt = AgentService.gene_salt()
             salt = AgentService.gene_salt()
@@ -341,7 +341,7 @@ def login():
 
 
             if agent_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
             if agent_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
                 sms = SMSService()
                 sms = SMSService()
-                result = sms.phoneSendCodeWithContent('18913573855', 934619, [agent_info.phone], '灰兔智能')
+                result = sms.phoneSendCodeWithContent(['18913573855', '13912720828'], 934619, [agent_info.phone], '灰兔智能')
                 logger.info(result)
                 logger.info(result)
 
 
             salt = AgentService.gene_salt()
             salt = AgentService.gene_salt()

Service/ReportService.py

@@ -237,7 +237,7 @@ class ReportService():
                                                                                      (page + 1) * limit).all()
                                                                                      (page + 1) * limit).all()
         data = []
         data = []
         for info in rent_info:
         for info in rent_info:
-            cur_total = round(info.real_total / 100, 2)
+            cur_total = round(info.agent_total / 100, 2)
             tmp = {
             tmp = {
                 'real_total': cur_total,
                 'real_total': cur_total,
                 'over_time': Helper.getFormatDate(info.created_at)
                 'over_time': Helper.getFormatDate(info.created_at)