# Conflicts: # app/common/dal/src/main/java/com/abssqr/plat/common/dal/AbssqrCoreConstants.java # app/common/dal/src/main/java/com/abssqr/plat/common/dal/mysql/auto/paging/PlanListPage.java