Commit 8200adaf authored by xianyang's avatar xianyang

合并

parent 53913ec8
...@@ -85,7 +85,9 @@ def wrapper_out(): ...@@ -85,7 +85,9 @@ def wrapper_out():
param.size = param.size if param.size else 10 param.size = param.size if param.size else 10
ret = func(db, param) ret = func(db, param)
return ret return ret
return inner return inner
return wrapper return wrapper
...@@ -114,11 +116,10 @@ def get_ip(): ...@@ -114,11 +116,10 @@ def get_ip():
return res return res
def get_month_last_month(month_type): def get_month_last_month(month_type):
last_month=0 last_month = 0
if month_type==2: if month_type == 2:
month_date = datetime.now().date() - relativedelta(months=1) month_date = datetime.now().date() - relativedelta(months=1)
last_month = month_date.strftime("%Y%m") last_month = month_date.strftime("%Y%m")
now_month =datetime.now().strftime("%Y%m") now_month = datetime.now().strftime("%Y%m")
return last_month,now_month return last_month, now_month
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment