3115053292
# Conflicts: # coolstore-partner-model/src/main/java/com/cool/store/entity/HyAdvancedSettingDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevZoneInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyOpenAreaInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerCertificationInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerClerkDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewLogDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewPlanDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerTaskInfoLogDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserPlatformBindDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyWorkflowStageDO.java