Merge branch 'mergeBranch' into internationalization

# Conflicts:
#	src/HDrpManagement/contractManage/components/selectAgentNew.vue

src/HDrpManagement/contractManage/components/selectAgentNew.vue

@@ -58,8 +58,6 @@ export default {
   methods:{
     async listData () {
 
-      /* if(!this.type) this.param.content.where.type = ''*/
-
       if (!this.flag){
         this.param.content.where.type = this.type
       }