Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -666,6 +666,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 	 * 0x23信息设置缓存 (缓存时间3天)
 	 * @param data
 	 */
+	@Override
 	public void saveBMSDemandAndChargerOutputInfo2Redis(BMSDemandAndChargerOutputData data) {
 		if (StringUtils.equals(data.getTransactionCode(), Constants.ILLEGAL_TRANSACTION_CODE)) {
 			return;

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java

@@ -116,6 +116,7 @@ public class PileMemberRelationServiceImpl implements PileMemberRelationService
 		return selectPileMemberRelationList(pileMemberRelation);
 	}
 
+	@Override
 	public List<MemberVO> selectMemberList(String pileSn) {
 		return pileMemberRelationMapper.selectMemberList(pileSn);
 	}