parent: 165f11c3 | patch | commit | show whitespace
cjl
2023-10-27 509c208bab15c3b125b5e3f8e6df141fb1d85acb 
Merge remote-tracking branch 'origin/cjl' into dev
2 files modified
6 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/WechatUtils.java 4 ●●●●● patch | view | raw | blame | history 
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java


@@ -748,6 +748,8 @@


                integerList.add(AllocationApproveEnum.IN_APPROVAL.value);


                integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);


                integerList.add(AllocationApproveEnum.DRAFT.value);


            }else if(type.equals(2)){


                integerList.add(0);


            }


        }


        if(type.equals(3)){




 screen-api/src/main/java/com/moral/api/utils/WechatUtils.java


@@ -25,8 +25,8 @@


public class WechatUtils {






    public static final String APPID = "wx41f4c3c007545088";


    public static final String SECRET = "9e1a328ad525dd169252a1cc5067a6f3";


    public static final String APPID = "wxf95fb77e0b1f8c09";


    public static final String SECRET = "acf3be9facf7f26bb8286c9b4eff93d0";




    public static JSONObject getSessionKeyOrOpenId(String code) {