Merge remote-tracking branch 'origin/master'

ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseClue.java

@@ -38,7 +38,6 @@ public class BaseClue implements Serializable {
 
 	@ApiModelProperty(value = "nidBack")
 	@Column(name = "nid_back")
-	@Convert(converter = JpaConverterAes.class)
 	private String nidBack;
 
 	@ApiModelProperty(value = "微信")

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -832,7 +832,7 @@ public class ClueServiceImpl implements ClueService {
         clue.setIsEncryption(DefaultNumberConstants.ZERO_NUMBER);
         String nidBack = clue.getNid();
         clue.setNid(clueTalk.getNewNid());
-        clue.setNidBack(nidBack);
+        clue.setNidBack(AESUtils.encrypt(nidBack,AdPlatFormConstants.AD_PLATFORM));
         clueRepository.save(clue);
 
         //查看crm的回流任务