20210223合并冲突

beneficiation/src/main/java/com/ccsens/beneficiation/service/RecordService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import com.ccsens.beneficiation.bean.dto.Message.BeneficiationMessageDto;
 import com.ccsens.beneficiation.bean.po.*;
+import com.ccsens.beneficiation.bean.po.Record;
 import com.ccsens.beneficiation.persist.dao.RecordDao;
 import com.ccsens.beneficiation.persist.mapper.AdjustRecordMapper;
 import com.ccsens.beneficiation.persist.mapper.EquipmentMapper;

tcm/src/main/java/com/ccsens/tcm/bean/vo/BiologicalSamplesVo.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class BiologicalSamplesVo {
     @Data
-    @ApiModel("搜索生物样本")
+    @ApiModel("搜索生物样本10.40")
     public static class selBiolog {
         @ApiModelProperty("医院名称")
         private String name;

util/src/test/java/com/ccsens/util/KeyTest.java

@@ -25,18 +25,18 @@ public class KeyTest {
     public void test3(){
 //        String key = "a6RlI/GctLgENUvF6DOY7w==";
         String key = "g9RlI/GctLgDFJvF6DOY7w==";
-        String string = "po3OynBO[M3579p6L7)o";
+        String string = "sdfe@#$QW";
         SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
         String encryptHex = aes.encryptHex(string);
         Console.log("{}",encryptHex);
     }
 
     /**解密*/
-//    @Test
+    @Test
     public void test4(){
-//        String key = "";
-        String key = System.getenv("CCSENS_GAME");
-        String encryptString = "37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9";
+        String key = "g9RlI/GctLgDFJvF6DOY7w==";
+//        String key = System.getenv("CCSENS_GAME");
+        String encryptString = "6ba13d9930a6ad888a3704376c920a75";
         SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, Base64.decode(key));
 
         //解密为字符串