Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Application/Snapshot/Notifications/SnapshotHandler.cs

@@ -189,7 +189,7 @@ public class SnapshotStartWorkFlow : INotificationHandler<StartWorkflowNotify>
     {
         try
         {
-            if (_sysSetting.Snapshot == false && notification.Workflow.ModuleCode != WorkflowModuleConsts.OrderHandle) return;
+            if (_sysSetting.Snapshot == false || notification.Workflow.ModuleCode != WorkflowModuleConsts.OrderHandle) return;
             await _snapshotPointsDomainService.AddPointsAsync(notification.Workflow.ExternalId, EPointsSource.Report, ESnapshotSMSStatus.Agree, 0);
         }
         catch (Exception e)

src/Hotline/Authentications/SessionContextManager.cs

@@ -76,7 +76,7 @@ public class SessionContextManager : ISessionContextManager, IScopeDependency
         var cityBase = JsonConvert.DeserializeObject<CityBaseConfiguration>(setting);
         DefaultCityBaseConfiguration config = source switch
         {
-            "province" => cityBase.CityProvince,
+            "province" => cityBase.CityProvinceAssign,
             "110" => cityBase.PublicSecurity,
             "yb-enterprise" => cityBase.CityEnterprise,
             "zzpt" => cityBase.ComprehensiveTreatment,