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

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -329,7 +329,7 @@
       <if test="companyId != null">
         and   bankinformation.companyId = #{companyId}
       </if>
-    </where>  order by bk_id
+    </where>  order by bk_date desc, bk_id desc
   </select>
   <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
         SELECT CONCAT(bk_bankcode,' ',bk_bankname) display,bk_bankname value FROM bankinformation WHERE COMPANYID=#{companyId}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -244,7 +244,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         //更新主表pb_pbdamount=从表二金额合计
         Double amountTotal2 = new Double(0);
         for (Recbalancedetail detail : recbalancedetail){
-            amountTotal2 = amountTotal2 + detail.getRbd_amount();
+            amountTotal2 = amountTotal2 + detail.getRbd_nowbalance();
         }
         updateRay.setId(rec.getMain().getId());
         updateRay.setRb_rdamount(amountTotal);

base-servers/gateway-server/src/main/resources/application.yml

@@ -175,5 +175,6 @@ auth:
   public-key: auth/pub.key
   ignores:
     - /api/auth/authorize
+    - /api/auth/sso/callback
     - /api/account/account/register
     - /api/auth/info