Commit 110f479e authored by houjn@hikoon.cn's avatar houjn@hikoon.cn

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

# Conflicts:
#	src/views/ecw/financial/receivable.vue
parents 036c71c0 d6f9b4a6
......@@ -290,7 +290,6 @@ export default {
};
},
activated(){
console.log(11)
this.getList();
},
created() {
......
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