Merge branch 'cc_20240603_wantarea_bigregion' into 'master'

license

See merge request hangzhou/java/custom_xfsg!9

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java

@@ -105,7 +105,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
         //防止一直在页面提交
         if (licenseTransactDO.getId() == null) {
             LicenseTransactDO license = applyLicenseMapper.selectByShopId(request.getShopId());
-            licenseTransactDO.setId(license.getId());
+            if (license != null) {
+                licenseTransactDO.setId(license.getId());
+            }
         }
         if (request.getId() == null) {
             applyLicenseMapper.insertSelective(licenseTransactDO);