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

# Conflicts:
#	frontend/saas-web/overrides/data/Connection.js

applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -31,7 +31,7 @@
     select 
     <include refid="Base_Column_List" />
     from paybalancedet
-    where pd_rbid = #{pdRbId,jdbcType=INTEGER}
+    where pd_rbid = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from paybalancedet

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -219,6 +219,8 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 align: 'stretch'
             },
             defaults: {
+                labelAlign:'right',
+                beforeLabelTextTpl: "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
                 xtype: 'textfield'
             },
             buttons: [{

frontend/saas-web/overrides/data/Connection.js

@@ -12,7 +12,7 @@ Ext.define('saas.override.data.Connection', {
          * @cfg {Object} defaultServerHeaders
          * 与defaultHeaders有区别，只在调用server api的时候才添加的headers
          */
-        defaultServerHeaders: {}
+        defaultServerHeaders: null
     },
 
     privates: {