[合并] ‘caihaohan’合并到 ‘lixuetao’ 解决冲突

adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml

@@ -6,43 +6,6 @@
     <!--调用时依靠Controller 中
         @Resource private BeanMapper beanMapper 进行自动装配，然后调用相应方法进行匹配-->
 
-
-    <mapping>
-        <!--角色对应实体类-->
-        <class-a>com.adc.da.sys.entity.RoleEO</class-a>
-        <class-b>com.adc.da.sys.vo.ddm.DdmRoleVO</class-b>
-
-        <!--区别字段-->
-        <field>
-            <a>id</a>
-            <b>rid</b>
-        </field>
-        <field>
-            <a>name</a>
-            <b>roleName</b>
-        </field>
-        <field>
-            <a>name</a>
-            <b>roleCode</b>
-        </field>
-        <field>
-            <a>remarks</a>
-            <b>rdesc</b>
-        </field>
-        <field>
-            <a>delFlag</a>
-            <b>enabled</b>
-        </field>
-        <field>
-            <a>menuEOIdList</a>
-            <b>menusstr</b>
-        </field>
-        <field>
-            <a>menuEOList</a>
-            <b>menus</b>
-        </field>
-    </mapping>
-
     <mapping>
         <!--菜单对应实体类-->
         <class-a>com.adc.da.sys.entity.MenuEO</class-a>