Conflicts: basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java |
||
|---|---|---|
| .. | ||
| basepro-common | ||
| basepro-framework | ||
| basepro-manager-dao | ||
| basepro-manager-interface | ||
| basepro-manager-pki | ||
| basepro-manager-pojo | ||
| basepro-manager-service | ||
| basepro-manager-web | ||
| pom.xml | ||