Merge remote-tracking branch 'origin/release' into release

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -117,6 +117,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
         user.setCreateTime(new Date());
         String salt = RandomStringUtils.randomAlphanumeric(20);
         user.setSalt(salt);
+        user.setScanType("5");
         user.setPlpassword(Base64.encode(user.getPassword()));
         user.setPassword(new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(user.getPassword()));
         this.saveOrUpdate(user);

dxhy-core/src/main/java/com/dxhy/core/service/openservice/impl/OpenServicePlatformServiceImpl.java

@@ -294,7 +294,7 @@ public class OpenServicePlatformServiceImpl implements IOpenServicePlatformServi
                 invoiceOcrData.setGMFDZDH(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PAYER_ADDR_TELL.getKey()));
                 invoiceOcrData.setGMFYHZH(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PAYER_BANK_ACCOUNT.getKey()));
 
-                invoiceOcrData.setHJJE(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PRICE_LIST.getKey()));
+                invoiceOcrData.setHJJE(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PRICE.getKey()));
 
 
                 //是否代开 vat_invoice_zhuan_yong_flag  TODO