Merge tag '2.1.1' into develop

app/src/pda-test/res/values/application.xml

@@ -2,5 +2,5 @@
 <resources>
   <string name="app_id">PDA</string>
   <string name="app_name">中药处方煎配朔源管理(测试版)</string>
-  <string name="app_screen">browser/kiosk?url=https://wx.hzliuzhi.com:4433/pharmacy/pda/</string>
+  <string name="app_screen">browser/kiosk?url=https://wx.hzliuzhi.com:4433/pharmacy/pda/?debug=eruda</string>
 </resources>