# Conflicts:
#	src/main/java/cn/com/poc/agent_application/aggregate/AgentApplicationInfoService.java
#	src/main/java/cn/com/poc/agent_application/aggregate/impl/AgentApplicationInfoServiceImpl.java
#	src/main/java/cn/com/poc/agent_application/convert/AgentApplicationInfoConvert.java
#	src/main/java/cn/com/poc/agent_application/rest/impl/AgentApplicationInfoRestImpl.java
#	src/main/java/cn/com/poc/expose/aggregate/impl/AgentApplicationServiceImpl.java
#	src/main/java/cn/com/poc/expose/rest/AgentApplicationRest.java
#	src/main/java/cn/com/poc/expose/rest/impl/AgentApplicationRestImpl.java

2.优化部分代码细节

在biz_agent_application_info中添加变量结构

See merge request !1

    --bug==1009110

--bug= 1009107