diff --git a/safesite/templates/riskadd.html b/safesite/templates/riskadd.html
index 9fc16317..0937d301 100644
--- a/safesite/templates/riskadd.html
+++ b/safesite/templates/riskadd.html
@@ -74,6 +74,12 @@
 </div>
 <script>
     var riskactid = {{ id }}
+    // $("#result").combobox({
+    //    url: 'api/getprodata?a=dic&&dicclass=33',
+    //    valueField: 'value',
+    //    textField: 'text',
+    //    editable: false,
+    //});
     $.get('api/riskact?a=detail&id=' + riskactid, function (res) {
         var data = res.data
         $('#fxqy').textbox('setValue', data.area__name)
diff --git a/safesite/urls.py b/safesite/urls.py
index 9fa5e944..5f678d62 100644
--- a/safesite/urls.py
+++ b/safesite/urls.py
@@ -181,14 +181,9 @@ urlpatterns = [
     path('test',views.test),
     path('.well-known/pki-validation/fileauth.txt',views.vewechat),#验证
     path('miniprogram/boUR15vyNu.txt',views.minip_px),
-<<<<<<< HEAD
     path('api/getresbilitydata',views.getresbilitydata),#责任制
     path('api/getprodata',views.getprodata),#操作规程
-=======
     path('boUR15vyNu.txt',views.minip_px),
-
->>>>>>> a4a3b20c8aa023a59b49709971b32d9bc8d9bb43
-
     #合作模块
     path('edu/',include('safesite.edu.urls')),
     path('datashow/',datashowview.area, name='datashow'),