Merge branch 'ty_fix' into alpha

Helius

2021-11-09 51c026156e7e0cd75805ef7b61f6dc6eeab7afb6

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java

@@ -15,9 +15,20 @@
public class ShopSalemanSettlement  extends BaseEntity {
   @Extend
   private static final long serialVersionUID = 1L; 

   /**
    * 结算编号头部编码
    */
    public static final String ORDERNO_START = "J";
   
   /**
    * 结算方式 1 线下结算
    */
    public static final Integer SETTLEMENTWAY_XXJS = 1;

   /**
    * 结算方式 2 微信余额结算
    */
   public static final Integer SETTLEMENTWAY_YEJS = 2;

   
   /**